You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/23 04:19:01 UTC
svn commit: r478447 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/databinding/xml/
core/src/main/java/org/apache/tuscany/core/implementation/composite/
core/src/main/java/org/apache/tuscany/core/loader/ core/src/ma...
Author: jmarino
Date: Wed Nov 22 19:19:00 2006
New Revision: 478447
URL: http://svn.apache.org/viewvc?view=rev&rev=478447
Log:
checkstyle and unit test cleanup
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/XSDDataTypeConverter.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StAXHelper.java Wed Nov 22 19:19:00 2006
@@ -37,9 +37,7 @@
import javax.xml.transform.Source;
public final class StAXHelper {
-
private static final XMLInputFactory INPUT_FACTORY = XMLInputFactory.newInstance();
-
private static final XMLOutputFactory OUTPUT_FACTORY = XMLOutputFactory.newInstance();
private StAXHelper() {
@@ -492,10 +490,8 @@
* The XMLStreamSerializer pulls events from the XMLStreamReader and dumps into the XMLStreamWriter
*/
public static class XMLStreamSerializer implements XMLStreamConstants {
-
public static final String NAMESPACE_PREFIX = "ns";
-
- private static int namespaceSuffix = 0;
+ private static int namespaceSuffix;
/*
* The behavior of the serializer is such that it returns when it
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java Wed Nov 22 19:19:00 2006
@@ -18,19 +18,17 @@
*/
package org.apache.tuscany.core.implementation.composite;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-
import java.net.URI;
import java.net.URL;
import java.util.List;
-
import javax.xml.namespace.QName;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.core.property.PropertyHelper;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
@@ -56,9 +54,11 @@
import org.apache.tuscany.spi.services.artifact.Artifact;
import org.apache.tuscany.spi.services.artifact.ArtifactRepository;
+import org.apache.tuscany.core.property.PropertyHelper;
+
/**
* Loads a composite component definition from an XML-based assembly file
- *
+ *
* @version $Rev$ $Date$
*/
public class CompositeLoader extends LoaderExtension<CompositeComponentType> {
@@ -68,9 +68,7 @@
private final ArtifactRepository artifactRepository;
- public CompositeLoader(@Autowire
- LoaderRegistry registry, @Autowire
- ArtifactRepository artifactRepository) {
+ public CompositeLoader(@Autowire LoaderRegistry registry, @Autowire ArtifactRepository artifactRepository) {
super(registry);
this.artifactRepository = artifactRepository;
}
@@ -80,9 +78,9 @@
}
public CompositeComponentType load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite =
- new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+ new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
composite.setName(reader.getAttributeValue(null, "name"));
boolean done = false;
while (!done) {
@@ -144,7 +142,7 @@
}
protected void resolveWires(CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
- throws InvalidWireException {
+ throws InvalidWireException {
List<WireDefinition> wireDefns = composite.getDeclaredWires();
String sourceSCAObjectName = null;
String componentReferenceName = null;
@@ -166,12 +164,13 @@
((BoundServiceDefinition) serviceDefinition).setTarget(aWireDefn.getTarget());
} else {
BindlessServiceDefinition bindlessSvcDefn =
- new BindlessServiceDefinition(serviceDefinition.getName(), serviceDefinition
- .getServiceContract(), false, aWireDefn.getTarget());
+ new BindlessServiceDefinition(serviceDefinition.getName(), serviceDefinition
+ .getServiceContract(), false, aWireDefn.getTarget());
composite.getDeclaredServices().put(sourceSCAObjectName, bindlessSvcDefn);
}
} else {
- if ((index = sourceSCAObjectName.indexOf(URI_DELIMITER)) != -1) {
+ index = sourceSCAObjectName.indexOf(URI_DELIMITER);
+ if (index != -1) {
componentReferenceName = sourceSCAObjectName.substring(index + 1);
sourceSCAObjectName = sourceSCAObjectName.substring(0, index);
}
@@ -179,11 +178,11 @@
componentDefinition = composite.getDeclaredComponents().get(sourceSCAObjectName);
if (componentDefinition != null) {
componentDefinition.add(createReferenceTarget(componentReferenceName, aWireDefn.getTarget(),
- componentDefinition));
+ componentDefinition));
} else {
InvalidWireException le =
- new InvalidWireException("Unable to resolve wire source '" + sourceSCAObjectName
- + "' in composite " + composite.getName());
+ new InvalidWireException("Unable to resolve wire source '" + sourceSCAObjectName
+ + "' in composite " + composite.getName());
le.addContextName("composite=" + composite.getName());
le.setIdentifier(sourceSCAObjectName);
throw le;
@@ -193,20 +192,20 @@
}
private ReferenceTarget createReferenceTarget(String componentReferenceName, URI target,
- ComponentDefinition componentDefn) throws InvalidWireException {
+ ComponentDefinition componentDefn) throws InvalidWireException {
ComponentType componentType = componentDefn.getImplementation().getComponentType();
if (componentReferenceName == null) {
// if there is ambiguity in determining the source of the wire or
// there is no reference to be wired
if (componentType.getReferences().size() > 1 || componentType.getReferences().isEmpty()) {
InvalidWireException le =
- new InvalidWireException("Unable to determine unique component reference for wire...");
+ new InvalidWireException("Unable to determine unique component reference for wire...");
le.addContextName("loading wire defintions for " + componentDefn.getName());
le.setIdentifier(componentDefn.getName() + "/?->" + target.toString());
throw le;
} else {
componentReferenceName =
- ((ReferenceDefinition) componentType.getReferences().values().iterator().next()).getName();
+ ((ReferenceDefinition) componentType.getReferences().values().iterator().next()).getName();
}
}
@@ -217,13 +216,13 @@
}
protected void verifyCompositeCompleteness(
- CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
- throws InvalidServiceException {
+ CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
+ throws InvalidServiceException {
// check if all of the composites services have been wired
for (ServiceDefinition svcDefn : composite.getDeclaredServices().values()) {
if (svcDefn instanceof BoundServiceDefinition && ((BoundServiceDefinition) svcDefn).getTarget() == null) {
InvalidServiceException le =
- new InvalidServiceException("Composite service not wired to any target...");
+ new InvalidServiceException("Composite service not wired to any target...");
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(svcDefn.getName());
throw le;
@@ -232,8 +231,8 @@
}
private void validateTarget(URI target,
- CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
- throws InvalidWireException {
+ CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
+ throws InvalidWireException {
String targetSCAObjectName = target.toString();
// if target is not a reference of the composite
@@ -242,7 +241,8 @@
int index = -1;
// if target is qualified
- if ((index = targetSCAObjectName.indexOf(URI_DELIMITER)) != -1) {
+ index = targetSCAObjectName.indexOf(URI_DELIMITER);
+ if (index != -1) {
componentServiceName = targetSCAObjectName.substring(index + 1);
targetSCAObjectName = targetSCAObjectName.substring(0, index);
}
@@ -252,21 +252,21 @@
if (componentDefinition != null) {
if (componentServiceName == null) {
if (componentDefinition.getImplementation().getComponentType().getServices().size() > 1
- || componentDefinition.getImplementation().getComponentType().getServices().isEmpty()) {
+ || componentDefinition.getImplementation().getComponentType().getServices().isEmpty()) {
InvalidWireException le =
- new InvalidWireException("Ambiguous target '" + componentDefinition.getName()
- + "' for wire definitions in composite - " + composite.getName());
+ new InvalidWireException("Ambiguous target '" + componentDefinition.getName()
+ + "' for wire definitions in composite - " + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(componentDefinition.getName());
throw le;
}
} else {
if (componentDefinition.getImplementation().getComponentType().getServices().get(
- componentServiceName) == null) {
+ componentServiceName) == null) {
InvalidWireException le =
- new InvalidWireException("Invalid target '" + targetSCAObjectName + "/"
- + componentServiceName + "' for wire definitions in composite - "
- + composite.getName());
+ new InvalidWireException("Invalid target '" + targetSCAObjectName + "/"
+ + componentServiceName + "' for wire definitions in composite - "
+ + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(targetSCAObjectName + "/" + componentServiceName);
throw le;
@@ -274,8 +274,8 @@
}
} else {
InvalidWireException le =
- new InvalidWireException("Invalid target '" + targetSCAObjectName
- + "' for wire definitions in composite - " + composite.getName());
+ new InvalidWireException("Invalid target '" + targetSCAObjectName
+ + "' for wire definitions in composite - " + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(targetSCAObjectName);
throw le;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java Wed Nov 22 19:19:00 2006
@@ -54,6 +54,7 @@
return COMPONENT_TYPE;
}
+ @SuppressWarnings("unchecked")
public ComponentType load(CompositeComponent parent,
ModelObject object,
XMLStreamReader reader,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Nov 22 19:19:00 2006
@@ -45,17 +45,15 @@
/**
* Loads a service definition from an XML-based assembly file
- *
+ *
* @version $Rev$ $Date$
*/
public class ServiceLoader extends LoaderExtension<ServiceDefinition> {
private static final QName SERVICE = new QName(XML_NAMESPACE_1_0, "service");
-
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
- @Constructor( { "registry" })
- public ServiceLoader(@Autowire
- LoaderRegistry registry) {
+ @Constructor({"registry"})
+ public ServiceLoader(@Autowire LoaderRegistry registry) {
super(registry);
}
@@ -64,7 +62,7 @@
}
public ServiceDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String target = null;
@@ -92,10 +90,6 @@
case END_ELEMENT:
if (SERVICE.equals(reader.getName())) {
if (binding != null) {
- /*
- * if (target == null) { InvalidReferenceException e = new InvalidReferenceException("No target for service ");
- * e.setIdentifier(name); throw e; }
- */
URI targetURI = null;
if (target != null) {
try {
@@ -108,7 +102,8 @@
}
// FIXME need a way to specify "remotable" on a service
- return new BoundServiceDefinition<Binding>(name, serviceContract, false, binding, targetURI);
+ return new BoundServiceDefinition<Binding>(name, serviceContract, false, binding,
+ targetURI);
} else if (target != null) {
URI targetURI;
try {
@@ -118,7 +113,6 @@
ire.setIdentifier(name);
throw ire;
}
-
return new BindlessServiceDefinition(name, serviceContract, false, targetURI);
} else {
// FIXME need a way to specify "remotable" on a service
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Wed Nov 22 19:19:00 2006
@@ -18,17 +18,17 @@
*/
package org.apache.tuscany.core.loader;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-
import java.net.URI;
import java.net.URISyntaxException;
-
import javax.xml.namespace.QName;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -38,11 +38,10 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.WireDefinition;
-import org.osoa.sca.annotations.Constructor;
/**
* Loads a wire from an XML-based assembly file
- *
+ *
* @version $Rev: 465084 $ $Date: 2006-10-18 04:00:49 +0530 (Wed, 18 Oct 2006) $
*/
public class WireLoader extends LoaderExtension<WireDefinition> {
@@ -52,9 +51,8 @@
public static final QName TARGET_URI = new QName(XML_NAMESPACE_1_0, "target.uri");
- @Constructor( { "registry" })
- public WireLoader(@Autowire
- LoaderRegistry registry) {
+ @Constructor({"registry"})
+ public WireLoader(@Autowire LoaderRegistry registry) {
super(registry);
}
@@ -62,15 +60,15 @@
return WIRE;
}
- public WireDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public WireDefinition load(CompositeComponent parent,
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert WIRE.equals(reader.getName());
-
WireDefinition wireDefn = null;
URI sourceURI = null;
URI targetURI = null;
String uriString = null;
-
while (true) {
switch (reader.next()) {
case START_ELEMENT:
@@ -81,7 +79,7 @@
sourceURI = new URI(uriString);
} else {
throw new InvalidWireException("Source not defined "
- + " inside 'Wire' definition in composite " + parent.getName());
+ + " inside 'Wire' definition in composite " + parent.getName());
}
} else if (reader.getName().equals(TARGET_URI)) {
uriString = reader.getElementText();
@@ -89,15 +87,15 @@
targetURI = new URI(uriString);
} else {
throw new InvalidWireException("Target not defined "
- + " inside 'Wire' definition in composite " + parent.getName());
+ + " inside 'Wire' definition in composite " + parent.getName());
}
} else {
throw new InvalidWireException("Unrecognized Element " + reader.getName()
- + " inside 'Wire' definition in composite " + parent.getName());
+ + " inside 'Wire' definition in composite " + parent.getName());
}
} catch (URISyntaxException e) {
throw new InvalidWireException("Exception loading wire info from scdl due to problems "
- + "with source or target URIs - " + e);
+ + "with source or target URIs - " + e);
}
reader.next();
@@ -110,7 +108,7 @@
wireDefn.setTarget(targetURI);
} else {
throw new InvalidWireException("Incomplete Wire Element Defintion " + " in composite "
- + parent.getName());
+ + parent.getName());
}
return wireDefn;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java Wed Nov 22 19:19:00 2006
@@ -25,13 +25,14 @@
import org.osoa.sca.SCA;
import org.osoa.sca.ServiceRuntimeException;
-import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
+
/**
* Bridges interceptors in a non-blocking fashion between an {@link org.apache.tuscany.spi.wire.InboundInvocationChain}
* and an {@link org.apache.tuscany.spi.wire.OutboundInvocationChain} by using a {@link
@@ -63,7 +64,7 @@
final CompositeContext currentContext = CurrentCompositeContext.getContext();
// Retrieve conversation id to transfer to new thread
// Notice that we cannot clear the conversation id from the current thread
- final Object conversationID = workContext.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER);
+ final Object conversationID = workContext.getIdentifier(CONVERSATIONAL_IDENTIFIER);
// Schedule the invocation of the next interceptor in a new Work instance
try {
workScheduler.scheduleWork(new Runnable() {
@@ -72,7 +73,7 @@
workContext.setCurrentCorrelationId(null);
// if we got a conversation id, transfer it to new thread
if (conversationID != null) {
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversationID);
+ workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, conversationID);
}
CompositeContext oldContext = CurrentCompositeContext.getContext();
try {
@@ -159,11 +160,11 @@
public void pushFromAddress(Object fromAddress) {
throw new UnsupportedOperationException();
}
-
+
public LinkedList<Object> getCallbackRoutingChain() {
return null;
}
-
+
public void setCallbackRoutingChain(LinkedList<Object> fromAddresses) {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Wed Nov 22 19:19:00 2006
@@ -23,12 +23,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.WorkContext;
-
import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
-
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.AbstractOutboundInvocationHandler;
@@ -37,6 +34,8 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
+import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
+
/**
* Receives a request from a proxy and performs an invocation on an {@link org.apache.tuscany.spi.wire.OutboundWire} via
@@ -61,13 +60,13 @@
private boolean contractIsConversational;
private Object convIdForRemotableTarget;
private Object convIdFromThread;
-
+
private WorkContext workContext;
public JDKOutboundInvocationHandler(OutboundWire wire) {
this(wire, null);
}
-
+
public JDKOutboundInvocationHandler(OutboundWire wire, WorkContext workContext)
throws NoMethodForOperationException {
Map<Operation<?>, OutboundInvocationChain> invocationChains = wire.getInvocationChains();
@@ -84,7 +83,7 @@
}
this.chains.put(method, new ChainHolder(entry.getValue()));
}
-
+
this.workContext = workContext;
this.contractIsConversational =
wire.getServiceContract().getInteractionScope().equals(InteractionScope.CONVERSATIONAL);
@@ -130,30 +129,30 @@
assert chain != null;
invoker = chain.getTargetInvoker();
}
-
+
if (contractIsConversational) {
assert workContext != null : "Work context cannot be null for conversational invocation";
// Check for a conv id on thread and remember it
- convIdFromThread = workContext.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER);
+ convIdFromThread = workContext.getIdentifier(CONVERSATIONAL_IDENTIFIER);
if (contractIsRemotable) {
if (convIdForRemotableTarget == null) {
convIdForRemotableTarget = new org.apache.tuscany.spi.wire.MessageId();
}
// Always use the conv id for this target
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, convIdForRemotableTarget);
+ workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, convIdForRemotableTarget);
} else if (convIdFromThread == null) {
Object newConvId = new org.apache.tuscany.spi.wire.MessageId();
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, newConvId);
+ workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, newConvId);
}
}
-
+
Object result = invoke(chain, invoker, args, null, null);
-
+
if (contractIsConversational && contractIsRemotable) {
// Make sure we restore the remembered conv id to continue propagating
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, convIdFromThread);
+ workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, convIdFromThread);
}
-
+
return result;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java Wed Nov 22 19:19:00 2006
@@ -22,9 +22,6 @@
import java.net.URI;
import java.net.URISyntaxException;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.implementation.java.JavaImplementation;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.InvalidWireException;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
@@ -35,14 +32,16 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
import org.apache.tuscany.spi.model.WireDefinition;
+import junit.framework.TestCase;
+import org.apache.tuscany.core.implementation.java.JavaImplementation;
+
/**
* This class tests the wire resolution function of the composite loader
- *
*/
public class CompositeLoaderWireResolutionTestCase extends TestCase {
private CompositeComponentType composite;
private CompositeLoader compositeLoader = new CompositeLoader(null, null);
-
+
@SuppressWarnings("unchecked")
public void setUp() throws Exception {
composite = new CompositeComponentType();
@@ -51,16 +50,16 @@
ServiceDefinition serviceDefn = new ServiceDefinition("compositeService1", null, true);
BindlessServiceDefinition bindlessSvcDefn = new BindlessServiceDefinition("bindlessSvc", null, true, null);
BoundServiceDefinition boundSvcDefn = new BoundServiceDefinition("boundSvc", null, true, null, null);
- BoundServiceDefinition boundSvcDefnWithTarget =
+ BoundServiceDefinition boundSvcDefnWithTarget =
new BoundServiceDefinition("boundSvcWithTarget", null, true, null, new URI("orgTarget"));
composite.add(serviceDefn);
composite.add(boundSvcDefn);
composite.add(bindlessSvcDefn);
composite.add(boundSvcDefnWithTarget);
-
+
ReferenceDefinition compositeReference = new ReferenceDefinition("compositeReference", null);
composite.add(compositeReference);
-
+
PojoComponentType pojoComponentType1 = new PojoComponentType();
ServiceDefinition pojoSvc1 = new ServiceDefinition("pojoSvc1", null, false);
pojoComponentType1.add(pojoSvc1);
@@ -68,10 +67,10 @@
pojoComponentType1.add(pojoRef1);
JavaImplementation pojoImpl1 = new JavaImplementation();
pojoImpl1.setComponentType(pojoComponentType1);
-
- ComponentDefinition component1 = new ComponentDefinition("Component1", pojoImpl1);
+
+ ComponentDefinition component1 = new ComponentDefinition("Component1", pojoImpl1);
composite.add(component1);
-
+
PojoComponentType pojoComponentType2 = new PojoComponentType();
ServiceDefinition pojoSvc2 = new ServiceDefinition("pojoSvc2", null, false);
pojoComponentType2.add(pojoSvc2);
@@ -83,61 +82,40 @@
pojoComponentType2.add(pojoRef3);
JavaImplementation pojoImpl2 = new JavaImplementation();
pojoImpl2.setComponentType(pojoComponentType2);
-
- ComponentDefinition component2 = new ComponentDefinition("Component2", pojoImpl2);
+
+ ComponentDefinition component2 = new ComponentDefinition("Component2", pojoImpl2);
composite.add(component2);
}
-
+
@SuppressWarnings("unchecked")
- public void testCompositeSvc2CompositeReferenceWire() throws URISyntaxException {
+ public void testCompositeSvc2CompositeReferenceWire() throws Exception {
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("compositeReference"));
composite.add(wireDefn);
- try {
- compositeLoader.resolveWires(composite);
- } catch ( InvalidWireException e ) {
- fail();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
- public void testCompositeSvc2ComponentValid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component1"));
composite.add(wireDefn);
-
- try {
- compositeLoader.resolveWires(composite);
- } catch ( InvalidWireException e ) {
- fail();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
- public void testCompositeSvc2ComponentQualifiedValid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentQualifiedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2/pojoSvc3"));
composite.add(wireDefn);
-
- try {
- compositeLoader.resolveWires(composite);
- } catch ( InvalidWireException e ) {
- fail();
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
@@ -145,17 +123,14 @@
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2/pojoSvc5"));
composite.add(wireDefn);
-
try {
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
}
-
+
@SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentUnQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
@@ -163,53 +138,34 @@
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2"));
composite.add(wireDefn);
-
try {
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
}
-
+
@SuppressWarnings("unchecked")
- public void testComponent2CompositeReferenceValid() throws URISyntaxException {
+ public void testComponent2CompositeReferenceValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("compositeReference"));
composite.add(wireDefn);
-
- try {
- compositeLoader.resolveWires(composite);
- } catch ( InvalidWireException e ) {
- fail();
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
- public void testComponent2CompositeReferenceQualifiedValid() throws URISyntaxException {
+ public void testComponent2CompositeReferenceQualifiedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component2/pojoRef3"));
wireDefn.setTarget(new URI("compositeReference"));
composite.add(wireDefn);
-
- try {
- compositeLoader.resolveWires(composite);
- } catch ( InvalidWireException e ) {
- fail();
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
public void testComponent2CompositeReferenceUnQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
@@ -217,37 +173,25 @@
wireDefn.setSource(new URI("Component2"));
wireDefn.setTarget(new URI("compositeReference"));
composite.add(wireDefn);
-
+
try {
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
-
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
}
-
+
@SuppressWarnings("unchecked")
- public void testComponent2ComponentQualifedValid() throws URISyntaxException {
+ public void testComponent2ComponentQualifedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("Component2/pojoSvc3"));
composite.add(wireDefn);
-
- try {
- compositeLoader.resolveWires(composite);
-
- } catch ( InvalidWireException e ) {
- fail();
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
- }
+ compositeLoader.resolveWires(composite);
}
-
+
@SuppressWarnings("unchecked")
public void testComponent2ComponentUnQualifedInvalid() throws URISyntaxException {
//undefined source and targets
@@ -255,18 +199,14 @@
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("Component2"));
composite.add(wireDefn);
-
try {
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
-
- //e.printStackTrace();
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
}
-
+
@SuppressWarnings("unchecked")
public void testInvalidWireDefinitions() throws URISyntaxException {
//undefined source and targets
@@ -274,26 +214,22 @@
wireDefn.setSource(new URI("undefinedSource"));
wireDefn.setTarget(new URI("compositeReference"));
composite.add(wireDefn);
-
+
try {
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
-
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
-
+
try {
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("undefinedTarget"));
composite.add(wireDefn);
compositeLoader.resolveWires(composite);
fail();
- } catch ( InvalidWireException e ) {
-
- } finally {
- composite.getDeclaredWires().remove(wireDefn);
+ } catch (InvalidWireException e) {
+ // expected
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java Wed Nov 22 19:19:00 2006
@@ -25,7 +25,6 @@
import org.apache.tuscany.spi.services.store.StoreMonitor;
import junit.framework.TestCase;
-import org.apache.tuscany.core.services.store.memory.MemoryStore;
import org.easymock.EasyMock;
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java Wed Nov 22 19:19:00 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.core.wire;
-import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.Interceptor;
@@ -26,6 +25,7 @@
import org.apache.tuscany.spi.wire.MessageImpl;
import junit.framework.TestCase;
+import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expectLastCall;
@@ -53,10 +53,10 @@
replay(scheduler);
WorkContext context = createMock(WorkContext.class);
String convID = "convID";
- EasyMock.expect(context.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER)).andReturn(convID);
+ EasyMock.expect(context.getIdentifier(CONVERSATIONAL_IDENTIFIER)).andReturn(convID);
context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
- context.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, convID);
+ context.setIdentifier(CONVERSATIONAL_IDENTIFIER, convID);
EasyMock.replay(context);
Message msg = new MessageImpl();
Interceptor next = EasyMock.createMock(Interceptor.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java Wed Nov 22 19:19:00 2006
@@ -120,7 +120,7 @@
}
private interface Foo {
- public String test(String s);
+ String test(String s);
}
private class MockInvoker implements TargetInvoker {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtension.java Wed Nov 22 19:19:00 2006
@@ -134,12 +134,12 @@
public static final QName XSD_YEARMONTH = new QName(URI_2001_SCHEMA_XSD, "gYearMonth");
private static final String[] XSD_TYPE_NAMES =
- {"string", "boolean", "double", "float", "int", "integer", "long", "short", "byte", "decimal",
- "base64Binary", "hexBinary", "anySimpleType", "anyType", "any", "QName", "dateTime", "date", "time",
- "normalizedString", "token", "unsignedLong", "unsignedInt", "unsignedShort", "unsignedByte",
- "positiveInteger", "negativeInteger", "nonNegativeInteger", "nonPositiveInteger", "gYearMonth",
- "gMonthDay", "gYear", "gMonth", "gDay", "duration", "Name", "NCName", "NMTOKEN", "NMTOKENS",
- "NOTATION", "ENTITY", "ENTITIES", "IDREF", "IDREFS", "anyURI", "language", "ID"};
+ {"string", "boolean", "double", "float", "int", "integer", "long", "short", "byte", "decimal",
+ "base64Binary", "hexBinary", "anySimpleType", "anyType", "any", "QName", "dateTime", "date", "time",
+ "normalizedString", "token", "unsignedLong", "unsignedInt", "unsignedShort", "unsignedByte",
+ "positiveInteger", "negativeInteger", "nonNegativeInteger", "nonPositiveInteger", "gYearMonth",
+ "gMonthDay", "gYear", "gMonth", "gDay", "duration", "Name", "NCName", "NMTOKEN", "NMTOKENS",
+ "NOTATION", "ENTITY", "ENTITIES", "IDREF", "IDREFS", "anyURI", "language", "ID"};
static {
for (String type : XSD_TYPE_NAMES) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/XSDDataTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/XSDDataTypeConverter.java?view=diff&rev=478447&r1=478446&r2=478447
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/XSDDataTypeConverter.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/XSDDataTypeConverter.java Wed Nov 22 19:19:00 2006
@@ -42,10 +42,10 @@
public class XSDDataTypeConverter {
public static final class Base64Binary {
private static final char[] S_BASE64CHAR =
- {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
- 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
- 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4',
- '5', '6', '7', '8', '9', '+', '/'};
+ {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+ 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+ 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4',
+ '5', '6', '7', '8', '9', '+', '/'};
private static final char S_BASE64PAD = '=';
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org