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 2007/02/13 21:31:52 UTC
svn commit: r507198 [1/2] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/databinding/impl/
core/src/main/...
Author: jmarino
Date: Tue Feb 13 12:31:48 2007
New Revision: 507198
URL: http://svn.apache.org/viewvc?view=rev&rev=507198
Log:
temp rename of getInvocationChains() to inbound and outbound variants so we can introduce Wire.getInvocationChains() without disturbing the existing build
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java Tue Feb 13 12:31:48 2007
@@ -41,7 +41,7 @@
public LocalTargetInvoker(Operation operation, OutboundWire outboundWire) {
assert operation != null;
- chain = outboundWire.getInvocationChains().get(operation);
+ chain = outboundWire.getOutboundInvocationChains().get(operation);
assert chain != null;
if (outboundWire.getSourceUri() != null) {
fromAddress = URI.create(UriHelper.getBaseName(outboundWire.getSourceUri()));
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Tue Feb 13 12:31:48 2007
@@ -103,8 +103,8 @@
OutboundWire targetWire,
boolean optimizable)
throws WiringException {
- Map<Operation<?>, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
- for (InboundInvocationChain inboundChain : sourceWire.getInvocationChains().values()) {
+ Map<Operation<?>, OutboundInvocationChain> targetChains = targetWire.getOutboundInvocationChains();
+ for (InboundInvocationChain inboundChain : sourceWire.getInboundInvocationChains().values()) {
// match invocation chains
OutboundInvocationChain outboundChain = targetChains.get(inboundChain.getOperation());
if (outboundChain == null) {
@@ -140,10 +140,10 @@
assert source != null;
assert target != null;
assert sourceWire.getTargetUri() != null;
- Map<Operation<?>, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> targetChains = targetWire.getInboundInvocationChains();
String portName = sourceWire.getTargetUri().getFragment();
// match outbound to inbound chains
- for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
+ for (OutboundInvocationChain outboundChain : sourceWire.getOutboundInvocationChains().values()) {
Operation<?> operation = outboundChain.getOperation();
InboundInvocationChain inboundChain = targetChains.get(operation);
if (inboundChain == null) {
@@ -196,7 +196,7 @@
connect(outboundChain, inboundChain, invoker, false);
}
ServiceBinding binding = (ServiceBinding) source;
- InboundInvocationChain chain = binding.getInboundWire().getInvocationChains().get(operation);
+ InboundInvocationChain chain = binding.getInboundWire().getInboundInvocationChains().get(operation);
chain.setTargetInvoker(invoker);
} else {
if (target instanceof Component && isOneWayOperation) {
@@ -423,7 +423,7 @@
private void handleReference(Reference reference) throws WiringException {
for (ReferenceBinding binding : reference.getReferenceBindings()) {
InboundWire inboundWire = binding.getInboundWire();
- Map<Operation<?>, InboundInvocationChain> inboundChains = inboundWire.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> inboundChains = inboundWire.getInboundInvocationChains();
for (InboundInvocationChain chain : inboundChains.values()) {
// add target invoker on inbound side
ServiceContract contract = inboundWire.getServiceContract();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java Tue Feb 13 12:31:48 2007
@@ -52,11 +52,11 @@
}
public void process(SCAObject source, OutboundWire sourceWire, SCAObject target, InboundWire targetWire) {
- Map<Operation<?>, OutboundInvocationChain> chains = sourceWire.getInvocationChains();
+ Map<Operation<?>, OutboundInvocationChain> chains = sourceWire.getOutboundInvocationChains();
for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : chains.entrySet()) {
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
- getTargetOperation(targetWire.getInvocationChains().keySet(), sourceOperation.getName());
+ getTargetOperation(targetWire.getInboundInvocationChains().keySet(), sourceOperation.getName());
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null && targetDataBinding == null) {
@@ -113,11 +113,11 @@
// Either Service or Reference
boolean isReference = source instanceof ReferenceBinding;
- Map<Operation<?>, InboundInvocationChain> chains = sourceWire.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> chains = sourceWire.getInboundInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : chains.entrySet()) {
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
- getTargetOperation(targetWire.getInvocationChains().keySet(), sourceOperation.getName());
+ getTargetOperation(targetWire.getOutboundInvocationChains().keySet(), sourceOperation.getName());
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null && targetDataBinding == null) {
@@ -131,7 +131,7 @@
interceptor.setMediator(mediator);
if (isReference) {
// FIXME: We need a better way to position the interceptors
- targetWire.getInvocationChains().get(targetOperation).addInterceptor(0, interceptor);
+ targetWire.getOutboundInvocationChains().get(targetOperation).addInterceptor(0, interceptor);
Interceptor tail = entry.getValue().getTailInterceptor();
if (tail != null) {
// HACK to relink the bridging interceptor
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java Tue Feb 13 12:31:48 2007
@@ -77,11 +77,11 @@
}
if (targetWire.getServiceContract().isRemotable()
&& !allowsPassByReference) {
- Map<Operation<?>, InboundInvocationChain> chains = targetWire.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> chains = targetWire.getInboundInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : chains.entrySet()) {
targetOperation = entry.getKey();
sourceOperation =
- getSourceOperation(sourceWire.getInvocationChains().keySet(), targetOperation.getName());
+ getSourceOperation(sourceWire.getOutboundInvocationChains().keySet(), targetOperation.getName());
if (null != sourceOperation) {
@@ -92,7 +92,8 @@
passByValueInterceptor.setArgsDataBindings(argsDataBindings);
passByValueInterceptor.setResultDataBinding(resultDataBinding);
entry.getValue().addInterceptor(0, passByValueInterceptor);
- tailInterceptor = sourceWire.getInvocationChains().get(sourceOperation).getTailInterceptor();
+ tailInterceptor =
+ sourceWire.getOutboundInvocationChains().get(sourceOperation).getTailInterceptor();
if (tailInterceptor != null) {
tailInterceptor.setNext(passByValueInterceptor);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Tue Feb 13 12:31:48 2007
@@ -200,7 +200,7 @@
connector.connect(component);
// this will be refactored out, currently for atomic
for (InboundWire inboundWire : component.getInboundWires()) {
- for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
+ for (InboundInvocationChain chain : inboundWire.getInboundInvocationChains().values()) {
Operation<?> operation = chain.getOperation();
String serviceName = inboundWire.getSourceUri().getFragment();
TargetInvoker invoker;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java Tue Feb 13 12:31:48 2007
@@ -94,7 +94,15 @@
this.uri = serviceName;
}
- public Map<Operation<?>, InboundInvocationChain> getInvocationChains() {
+ public URI getTargetUri() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setTargetUri(URI uri) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<Operation<?>, InboundInvocationChain> getInboundInvocationChains() {
return chains;
}
@@ -102,7 +110,7 @@
this.chains.putAll(chains);
}
- public void addInvocationChain(Operation<?> operation, InboundInvocationChain chain) {
+ public void addInboundInvocationChain(Operation<?> operation, InboundInvocationChain chain) {
chains.put(operation, chain);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java Tue Feb 13 12:31:48 2007
@@ -110,11 +110,11 @@
this.targetWire = wire;
}
- public Map<Operation<?>, OutboundInvocationChain> getInvocationChains() {
+ public Map<Operation<?>, OutboundInvocationChain> getOutboundInvocationChains() {
return chains;
}
- public void addInvocationChain(Operation<?> operation, OutboundInvocationChain chain) {
+ public void addOutboundInvocationChain(Operation<?> operation, OutboundInvocationChain chain) {
chains.put(operation, chain);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java Tue Feb 13 12:31:48 2007
@@ -76,7 +76,7 @@
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
chain.addInterceptor(new InvokerInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addInboundInvocationChain(operation, chain);
}
if (contract.getCallbackName() != null) {
wire.setCallbackReferenceName(service.getCallbackReferenceName());
@@ -119,7 +119,7 @@
inboundWire.setSourceUri(referenceBinding.getUri());
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
- inboundWire.addInvocationChain(operation, chain);
+ inboundWire.addInboundInvocationChain(operation, chain);
}
OutboundWire outboundWire = new OutboundWireImpl(referenceBinding.getBindingType());
outboundWire.setSourceUri(referenceBinding.getUri());
@@ -141,7 +141,7 @@
} else {
chain.addInterceptor(new InvokerInterceptor());
}
- outboundWire.addInvocationChain(operation, chain);
+ outboundWire.addOutboundInvocationChain(operation, chain);
}
// Add target callback chain to outbound wire
if (contract.getCallbackName() != null) {
@@ -167,7 +167,7 @@
for (Operation<?> operation : bindingContract.getOperations().values()) {
InboundInvocationChain inboundChain = createInboundChain(operation);
inboundChain.addInterceptor(new SynchronousBridgingInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
}
OutboundWire outboundWire = new OutboundWireImpl(serviceBinding.getBindingType());
@@ -177,7 +177,7 @@
for (Operation<?> operation : contract.getOperations().values()) {
OutboundInvocationChain outboundChain = createOutboundChain(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
}
// Add target callback chain to outbound wire
@@ -287,7 +287,7 @@
wire.setTargetUri(uri);
for (Operation<?> operation : contract.getOperations().values()) {
OutboundInvocationChain chain = createOutboundChain(operation);
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
}
if (contract.getCallbackName() != null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java Tue Feb 13 12:31:48 2007
@@ -54,7 +54,7 @@
public static Map<Method, InboundInvocationChain> createInboundMapping(InboundWire wire, Method[] methods)
throws NoMethodForOperationException {
Map<Method, InboundInvocationChain> chains = new HashMap<Method, InboundInvocationChain>();
- for (Map.Entry<Operation<?>, InboundInvocationChain> entry : wire.getInvocationChains().entrySet()) {
+ for (Map.Entry<Operation<?>, InboundInvocationChain> entry : wire.getInboundInvocationChains().entrySet()) {
Operation<?> operation = entry.getKey();
InboundInvocationChain chain = entry.getValue();
Method method = findMethod(operation, methods);
@@ -77,7 +77,7 @@
*/
public static Map<Method, OutboundChainHolder> createInterfaceToWireMapping(Class<?> interfaze, OutboundWire wire)
throws NoMethodForOperationException {
- Map<Operation<?>, OutboundInvocationChain> invocationChains = wire.getInvocationChains();
+ Map<Operation<?>, OutboundInvocationChain> invocationChains = wire.getOutboundInvocationChains();
Map<Method, OutboundChainHolder> chains = new HashMap<Method, OutboundChainHolder>(invocationChains.size());
Method[] methods = interfaze.getMethods();
for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : invocationChains.entrySet()) {
@@ -99,7 +99,7 @@
* @return true if the wire is optimizable
*/
public static boolean isOptimizable(OutboundWire wire) {
- for (OutboundInvocationChain chain : wire.getInvocationChains().values()) {
+ for (OutboundInvocationChain chain : wire.getOutboundInvocationChains().values()) {
if (chain.getHeadInterceptor() != null) {
Interceptor current = chain.getHeadInterceptor();
if (current == null) {
@@ -129,7 +129,7 @@
if (!(container instanceof Component) || !((Component) container).isOptimizable()) {
return false;
}
- for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
+ for (InboundInvocationChain chain : wire.getInboundInvocationChains().values()) {
if (chain.getHeadInterceptor() != null) {
Interceptor current = chain.getHeadInterceptor();
while (current != null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java Tue Feb 13 12:31:48 2007
@@ -50,7 +50,7 @@
Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
chains.put(operation, chain);
OutboundWire wire = EasyMock.createNiceMock(OutboundWire.class);
- wire.getInvocationChains();
+ wire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(chains);
EasyMock.expect(wire.getServiceContract()).andReturn(serviceContract);
EasyMock.replay(wire);
@@ -76,7 +76,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
URI uri = URI.create("foo");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
- wire.getInvocationChains();
+ wire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(chains);
EasyMock.expect(wire.getServiceContract()).andReturn(contract);
EasyMock.replay(wire);
@@ -99,7 +99,7 @@
Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
chains.put(operation, chain);
OutboundWire wire = EasyMock.createNiceMock(OutboundWire.class);
- wire.getInvocationChains();
+ wire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(chains);
EasyMock.expect(wire.getServiceContract()).andReturn(serviceContract);
EasyMock.replay(wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java Tue Feb 13 12:31:48 2007
@@ -95,7 +95,7 @@
InboundWire targetWire = new InboundWireImpl();
targetWire.setSourceUri(TARGET);
targetWire.setServiceContract(contract);
- targetWire.addInvocationChain(operation, chain);
+ targetWire.addInboundInvocationChain(operation, chain);
MockInvoker mockInvoker = new MockInvoker();
@@ -119,7 +119,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setTargetUri(TARGET_NAME);
outboundWire.setServiceContract(contract);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
Map<String, List<OutboundWire>> outboundWires = new HashMap<String, List<OutboundWire>>();
List<OutboundWire> list = new ArrayList<OutboundWire>();
@@ -145,14 +145,14 @@
targetInboundChain.addInterceptor(new SynchronousBridgingInterceptor());
InboundWire serviceInboundWire = new InboundWireImpl(qName);
serviceInboundWire.setServiceContract(contract);
- serviceInboundWire.addInvocationChain(operation, targetInboundChain);
+ serviceInboundWire.addInboundInvocationChain(operation, targetInboundChain);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
// place an invoker interceptor on the end
targetOutboundChain.addInterceptor(new InvokerInterceptor());
OutboundWire targetOutboundWire = new OutboundWireImpl(qName);
targetOutboundWire.setServiceContract(contract);
- targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
+ targetOutboundWire.addOutboundInvocationChain(operation, targetOutboundChain);
serviceBinding.setInboundWire(serviceInboundWire);
serviceBinding.setOutboundWire(targetOutboundWire);
@@ -177,14 +177,14 @@
InboundWire localServiceInboundWire = new InboundWireImpl();
localServiceInboundWire.setSourceUri(SERVICE_TARGET);
localServiceInboundWire.setServiceContract(contract);
- localServiceInboundWire.addInvocationChain(operation, targetInboundChain);
+ localServiceInboundWire.addInboundInvocationChain(operation, targetInboundChain);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
// place an invoker interceptor on the end
targetOutboundChain.addInterceptor(new InvokerInterceptor());
OutboundWire targetOutboundWire = new OutboundWireImpl();
targetOutboundWire.setServiceContract(contract);
- targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
+ targetOutboundWire.addOutboundInvocationChain(operation, targetOutboundChain);
serviceBinding.setInboundWire(localServiceInboundWire);
serviceBinding.setOutboundWire(targetOutboundWire);
@@ -201,7 +201,7 @@
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
InboundWire referenceInboundWire = new InboundWireImpl();
referenceInboundWire.setServiceContract(contract);
- referenceInboundWire.addInvocationChain(operation, inboundChain);
+ referenceInboundWire.addInboundInvocationChain(operation, inboundChain);
referenceInboundWire.setSourceUri(uri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound chains always contains at least one interceptor
@@ -209,7 +209,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(target);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
outboundWire.setSourceUri(uri);
referenceBinding.setInboundWire(referenceInboundWire);
referenceBinding.setOutboundWire(outboundWire);
@@ -222,14 +222,14 @@
InboundWire wire = new InboundWireImpl();
wire.setServiceContract(contract);
LocalReferenceBinding referenceBinding = new LocalReferenceBinding(URI.create("baz"));
- wire.addInvocationChain(operation, chain);
+ wire.addInboundInvocationChain(operation, chain);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
// place an invoker interceptor on the end
targetOutboundChain.addInterceptor(new InvokerInterceptor());
OutboundWire targetOutboundWire = new OutboundWireImpl();
targetOutboundWire.setServiceContract(contract);
- targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
+ targetOutboundWire.addOutboundInvocationChain(operation, targetOutboundChain);
referenceBinding.setInboundWire(wire);
referenceBinding.setOutboundWire(targetOutboundWire);
// manually connect the service chains
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java Tue Feb 13 12:31:48 2007
@@ -55,14 +55,14 @@
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setSourceUri(sourceUri);
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setServiceContract(contract);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setSourceUri(sourceUri);
outboundWire.setTargetUri(TARGET_NAME);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
outboundWire.setServiceContract(contract);
// create the binding
@@ -96,7 +96,7 @@
MessageImpl msg = new MessageImpl();
Map<String, List<OutboundWire>> wires = source.getOutboundWires();
OutboundWire wire = wires.get(TARGET_FRAGMENT).get(0);
- OutboundInvocationChain chain = wire.getInvocationChains().get(operation);
+ OutboundInvocationChain chain = wire.getOutboundInvocationChains().get(operation);
msg.setTargetInvoker(chain.getTargetInvoker());
Message resp = chain.getHeadInterceptor().invoke(msg);
assertEquals(RESPONSE, resp.getBody());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java Tue Feb 13 12:31:48 2007
@@ -74,7 +74,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setSourceUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- outboundWire.getInvocationChains();
+ outboundWire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -95,7 +95,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setSourceUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- outboundWire.getInvocationChains();
+ outboundWire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -160,7 +160,7 @@
public void testIncompatibleInboundOutboundWiresConnect() throws Exception {
Operation<Type> operation = new Operation<Type>("bar", null, null, null);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.addInvocationChain(operation, new InboundInvocationChainImpl(operation));
+ inboundWire.addInboundInvocationChain(operation, new InboundInvocationChainImpl(operation));
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setSourceUri(URI.create("target"));
try {
@@ -180,7 +180,7 @@
inboundWire.setSourceUri(URI.create("sca://foo"));
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setTargetUri(URI.create("target"));
- outboundWire.addInvocationChain(operation, new OutboundInvocationChainImpl(operation));
+ outboundWire.addOutboundInvocationChain(operation, new OutboundInvocationChainImpl(operation));
try {
connector.connect(container, outboundWire, container, inboundWire, false);
fail();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java Tue Feb 13 12:31:48 2007
@@ -53,7 +53,7 @@
owire.setSourceUri(URI.create("target"));
InboundWire iwire = createNiceMock(InboundWire.class);
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- expect(iwire.getInvocationChains()).andReturn(chains);
+ expect(iwire.getInboundInvocationChains()).andReturn(chains);
replay(iwire);
WirePostProcessorRegistry registry = createMock(WirePostProcessorRegistry.class);
registry.process(EasyMock.eq(container), EasyMock.eq(iwire), EasyMock.eq(container), EasyMock.eq(owire));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java Tue Feb 13 12:31:48 2007
@@ -54,7 +54,7 @@
connector.connect(parent);
// connect the internal reference chains
connector.connect(reference);
- InboundInvocationChain chain = referenceBinding.getInboundWire().getInvocationChains().get(operation);
+ InboundInvocationChain chain = referenceBinding.getInboundWire().getInboundInvocationChains().get(operation);
Interceptor interceptor = chain.getHeadInterceptor();
MessageImpl msg = new MessageImpl();
msg.setTargetInvoker(new MockInvoker());
@@ -75,7 +75,7 @@
componentManager.register(parent);
connector.connect(parent);
connector.connect(reference);
- InboundInvocationChain chain = referenceBinding.getInboundWire().getInvocationChains().get(operation);
+ InboundInvocationChain chain = referenceBinding.getInboundWire().getInboundInvocationChains().get(operation);
Interceptor interceptor = chain.getHeadInterceptor();
MessageImpl msg = new MessageImpl();
msg.setTargetInvoker(new MockInvoker());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java Tue Feb 13 12:31:48 2007
@@ -79,7 +79,7 @@
inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new NonBlockingForwardNonBlockingCallbackConnectionTestCase.MockInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
componentManager.register(target);
AtomicComponent source = createSource();
@@ -87,7 +87,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java Tue Feb 13 12:31:48 2007
@@ -78,7 +78,7 @@
inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new NonBlockingForwardSyncCallbackConnectionTestCase.MockInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
componentManager.register(target);
AtomicComponent source = createSource();
@@ -86,7 +86,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new NonBlockingForwardSyncCallbackConnectionTestCase.MockInterceptor());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java Tue Feb 13 12:31:48 2007
@@ -51,7 +51,7 @@
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setSourceUri(referenceUri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -60,7 +60,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(TARGET_NAME);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
outboundWire.setSourceUri(referenceUri);
ReferenceBinding referenceBinding = EasyMock.createMock(ReferenceBinding.class);
@@ -90,7 +90,7 @@
inboundChain.addInterceptor(inboundInterceptor);
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setSourceUri(referenceUri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound always contains at lease one interceptor
@@ -99,7 +99,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setSourceUri(referenceUri);
outboundWire.setTargetUri(TARGET_NAME);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
ReferenceBinding referenceBinding = EasyMock.createMock(ReferenceBinding.class);
referenceBinding.setReference(EasyMock.isA(Reference.class));
@@ -136,14 +136,14 @@
inboundChain.addInterceptor(new InvokerInterceptor());
InboundWire targetWire = new InboundWireImpl();
targetWire.setServiceContract(contract);
- targetWire.addInvocationChain(operation, inboundChain);
+ targetWire.addInboundInvocationChain(operation, inboundChain);
targetWire.setSourceUri(TARGET_NAME);
// create the outbound wire and chain from the source component
OutboundInvocationChain sourceChain = new OutboundInvocationChainImpl(operation);
OutboundWire sourceWire = new OutboundWireImpl();
sourceWire.setServiceContract(contract);
sourceWire.setTargetUri(TARGET_NAME);
- sourceWire.addInvocationChain(operation, sourceChain);
+ sourceWire.addOutboundInvocationChain(operation, sourceChain);
connector.connect(source, sourceWire, target, targetWire, false);
Interceptor interceptor = sourceChain.getHeadInterceptor();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java Tue Feb 13 12:31:48 2007
@@ -85,7 +85,7 @@
inboundChain = new InboundInvocationChainImpl(operation);
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setSourceUri(SOURCE);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound chains always contains at least one interceptor
@@ -93,7 +93,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(TARGET_NAME);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
outboundWire.setSourceUri(SOURCE);
sourceServiceBinding = new MockServiceBinding(SOURCE);
@@ -106,7 +106,7 @@
inboundChain.addInterceptor(new InvokerInterceptor());
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setSourceUri(TARGET);
AtomicComponent atomicTarget = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(atomicTarget.getTargetWire(EasyMock.isA(String.class))).andReturn(inboundWire).atLeastOnce();
@@ -128,7 +128,7 @@
Reference referenceTarget = new ReferenceImpl(TARGET, contract);
referenceTarget.addReferenceBinding(binding);
// put a terminating interceptor on the outbound wire of the reference for testing an invocation
- binding.getOutboundWire().getInvocationChains().get(operation).addInterceptor(new InvokerInterceptor());
+ binding.getOutboundWire().getOutboundInvocationChains().get(operation).addInterceptor(new InvokerInterceptor());
connector.connect(binding, binding.getInboundWire(), binding, binding.getOutboundWire(), true);
parent = EasyMock.createNiceMock(CompositeComponent.class);
EasyMock.expect(parent.getUri()).andReturn(TARGET);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java Tue Feb 13 12:31:48 2007
@@ -77,7 +77,7 @@
inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
componentManager.register(target);
AtomicComponent source = createSource();
@@ -85,7 +85,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new MockInterceptor());
@@ -123,7 +123,7 @@
inboundWire.setServiceContract(contract);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
inboundWire.setSourceUri(targetUriFragment);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getTargetWire(EasyMock.eq("service"))).andReturn(inboundWire);
@@ -132,7 +132,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setServiceContract(contract);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
outboundWire.setTargetUri(targetUriFragment);
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
@@ -178,7 +178,7 @@
inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
- inboundWire.addInvocationChain(operation, inboundChain);
+ inboundWire.addInboundInvocationChain(operation, inboundChain);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getTargetWire(EasyMock.eq("service"))).andReturn(inboundWire);
@@ -187,7 +187,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
- outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.addOutboundInvocationChain(operation, outboundChain);
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new MockInterceptor());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java Tue Feb 13 12:31:48 2007
@@ -53,7 +53,7 @@
OutboundWire outbound = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outbound.getTargetUri()).andReturn(URI.create("scasystem://target#bar")).atLeastOnce();
EasyMock.expect(outbound.getSourceUri()).andReturn(URI.create("scasystem://target#bar"));
- outbound.getInvocationChains();
+ outbound.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outbound.getTargetCallbackInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java Tue Feb 13 12:31:48 2007
@@ -95,7 +95,7 @@
outboundChains.put(operation, outboundChain);
outboundWire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(outboundWire.getInvocationChains()).andReturn(outboundChains);
+ EasyMock.expect(outboundWire.getOutboundInvocationChains()).andReturn(outboundChains);
EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract).anyTimes();
EasyMock.expect(outboundWire.getTargetCallbackInvocationChains()).andReturn(inboundChains).anyTimes();
URI uri = URI.create("foo");
@@ -104,7 +104,7 @@
EasyMock.replay(outboundWire);
inboundWire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(inboundWire.getInvocationChains()).andReturn(inboundChains);
+ EasyMock.expect(inboundWire.getInboundInvocationChains()).andReturn(inboundChains);
EasyMock.expect(inboundWire.getSourceCallbackInvocationChains(EasyMock.eq(uri))).andReturn(outboundChains)
.anyTimes();
EasyMock.replay(inboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java Tue Feb 13 12:31:48 2007
@@ -84,7 +84,7 @@
OutboundInvocationChain outboundChain = createMock(OutboundInvocationChain.class);
outboundChains.put(op1, outboundChain);
- expect(outboundWire.getInvocationChains()).andReturn(outboundChains);
+ expect(outboundWire.getOutboundInvocationChains()).andReturn(outboundChains);
outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor) EasyMock.anyObject());
Map<Operation<?>, InboundInvocationChain> inboundChains =
@@ -102,7 +102,7 @@
InboundInvocationChain inboundChain = createMock(InboundInvocationChain.class);
inboundChains.put(op2, inboundChain);
- expect(inboundWire.getInvocationChains()).andReturn(inboundChains);
+ expect(inboundWire.getInboundInvocationChains()).andReturn(inboundChains);
ServiceContract<Type> contract = new JavaServiceContract();
Map<String, Operation<Type>> operations = Collections.emptyMap();
@@ -135,7 +135,7 @@
OutboundInvocationChain outboundChain = createMock(OutboundInvocationChain.class);
outboundChains.put(op1, outboundChain);
- expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
+ expect(outboundWire.getOutboundInvocationChains()).andReturn(outboundChains).anyTimes();
outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor) EasyMock.anyObject());
Map<Operation<?>, InboundInvocationChain> inboundChains =
@@ -153,7 +153,7 @@
InboundInvocationChain inboundChain = createMock(InboundInvocationChain.class);
inboundChains.put(op2, inboundChain);
- expect(inboundWire.getInvocationChains()).andReturn(inboundChains).anyTimes();
+ expect(inboundWire.getInboundInvocationChains()).andReturn(inboundChains).anyTimes();
ServiceContract<Type> contract = new JavaServiceContract();
Map<String, Operation<Type>> operations = Collections.emptyMap();
@@ -187,7 +187,7 @@
OutboundInvocationChain outboundChain = createMock(OutboundInvocationChain.class);
outboundChains.put(op1, outboundChain);
- expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
+ expect(outboundWire.getOutboundInvocationChains()).andReturn(outboundChains).anyTimes();
// outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
// EasyMock.anyObject());
@@ -206,7 +206,7 @@
InboundInvocationChain inboundChain = createMock(InboundInvocationChain.class);
inboundChains.put(op2, inboundChain);
- expect(inboundWire.getInvocationChains()).andReturn(inboundChains).anyTimes();
+ expect(inboundWire.getInboundInvocationChains()).andReturn(inboundChains).anyTimes();
inboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor) EasyMock.anyObject());
ServiceContract<Type> contract = new JavaServiceContract();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java Tue Feb 13 12:31:48 2007
@@ -88,9 +88,9 @@
outChainsMap.put(operation1, outChain);
expect(inboundWire.getServiceContract()).andReturn(serviceContract);
- expect(inboundWire.getInvocationChains()).andReturn(inChainsMap);
+ expect(inboundWire.getInboundInvocationChains()).andReturn(inChainsMap);
expect(outboundWire.getServiceContract()).andReturn(serviceContract).times(2);
- expect(outboundWire.getInvocationChains()).andReturn(outChainsMap).times(2);
+ expect(outboundWire.getOutboundInvocationChains()).andReturn(outChainsMap).times(2);
Interceptor inInterceptor = createMock(Interceptor.class);
Interceptor outInterceptor = createMock(Interceptor.class);
@@ -132,9 +132,9 @@
outChainsMap.put(operation1, outChain);
expect(inboundWire.getServiceContract()).andReturn(serviceContract);
- expect(inboundWire.getInvocationChains()).andReturn(inChainsMap);
+ expect(inboundWire.getInboundInvocationChains()).andReturn(inChainsMap);
expect(outboundWire.getServiceContract()).andReturn(serviceContract).times(2);
- expect(outboundWire.getInvocationChains()).andReturn(outChainsMap).times(2);
+ expect(outboundWire.getOutboundInvocationChains()).andReturn(outChainsMap).times(2);
Interceptor inInterceptor = createMock(Interceptor.class);
Interceptor outInterceptor = createMock(Interceptor.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Tue Feb 13 12:31:48 2007
@@ -134,7 +134,7 @@
Map<Operation<?>, OutboundInvocationChain> chains = Collections.emptyMap();
wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getSourceUri()).andReturn(URI.create("#target")).atLeastOnce();
- EasyMock.expect(wire.getInvocationChains()).andReturn(chains).atLeastOnce();
+ EasyMock.expect(wire.getOutboundInvocationChains()).andReturn(chains).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
JavaServiceContract targetContract = new JavaServiceContract(Target.class);
targetContract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Tue Feb 13 12:31:48 2007
@@ -55,7 +55,7 @@
Constructor<SourceImpl> ctr = SourceImpl.class.getConstructor();
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(ctr));
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
- wire.getInvocationChains();
+ wire.getOutboundInvocationChains();
EasyMock.expectLastCall().andReturn(new HashMap<Operation<?>, OutboundInvocationChain>()).atLeastOnce();
URI uri = URI.create("#target");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
@@ -66,7 +66,7 @@
.andAnswer(new IAnswer<Target>() {
public Target answer() throws Throwable {
OutboundWire wire = (OutboundWire) EasyMock.getCurrentArguments()[1];
- wire.getInvocationChains();
+ wire.getOutboundInvocationChains();
return target;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Tue Feb 13 12:31:48 2007
@@ -223,7 +223,7 @@
ServiceContract<?> contract = registry.introspect(interfaze);
for (Operation operation : contract.getOperations().values()) {
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Tue Feb 13 12:31:48 2007
@@ -247,7 +247,7 @@
if (interceptor != null) {
chain.addInterceptor(interceptor);
}
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java Tue Feb 13 12:31:48 2007
@@ -55,7 +55,7 @@
chain.prepare();
//chains.put(echo, chain);
OutboundWire wire = new OutboundWireImpl();
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
wire.setServiceContract(contract);
wire.setSourceUri(URI.create("#wire"));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java Tue Feb 13 12:31:48 2007
@@ -66,7 +66,7 @@
wire.setServiceContract(contract);
wire.setSourceUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("checkedException");
- wire.addInvocationChain(operation, createChain(checkedMethod, operation));
+ wire.addOutboundInvocationChain(operation, createChain(checkedMethod, operation));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(TestBean.class, wire, null);
try {
TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
@@ -85,7 +85,7 @@
wire.setSourceUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("runtimeException");
OutboundInvocationChain chain = createChain(runtimeMethod, operation);
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(TestBean.class, wire, null);
try {
TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java Tue Feb 13 12:31:48 2007
@@ -54,7 +54,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
- wire.addInvocationChain(operation, createChain(operation));
+ wire.addOutboundInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
@@ -64,7 +64,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
- wire.addInvocationChain(operation, createChain(operation));
+ wire.addOutboundInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
try {
@@ -84,7 +84,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
wire.setServiceContract(contract);
- wire.addInvocationChain(operation, source);
+ wire.addOutboundInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
try {
assertEquals("foo", handler.invoke(hello, new Object[]{}));
@@ -103,7 +103,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
wire.setServiceContract(contract);
- wire.addInvocationChain(operation, source);
+ wire.addOutboundInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java Tue Feb 13 12:31:48 2007
@@ -45,7 +45,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
chains.put(op, chain);
- EasyMock.expect(wire.getInvocationChains()).andReturn(chains);
+ EasyMock.expect(wire.getOutboundInvocationChains()).andReturn(chains);
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
@@ -69,7 +69,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.expect(wire.getTargetService()).andReturn(new Foo() {
public void hello() {
}
@@ -90,7 +90,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
@@ -113,7 +113,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Tue Feb 13 12:31:48 2007
@@ -51,7 +51,7 @@
OutboundWire wire = new OutboundWireImpl();
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
assertTrue(WireUtils.isOptimizable(wire));
}
@@ -61,7 +61,7 @@
OutboundWire wire = new OutboundWireImpl();
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
chain.addInterceptor(new NonOptimizableInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addOutboundInvocationChain(operation, chain);
assertFalse(WireUtils.isOptimizable(wire));
}
@@ -72,7 +72,7 @@
InboundWire wire = new InboundWireImpl();
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addInboundInvocationChain(operation, chain);
assertTrue(WireUtils.isOptimizable(component, wire));
}
@@ -84,7 +84,7 @@
InboundWire wire = new InboundWireImpl();
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addInboundInvocationChain(operation, chain);
assertTrue(WireUtils.isOptimizable(component, wire));
}
@@ -94,7 +94,7 @@
InboundWire wire = new InboundWireImpl();
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new NonOptimizableInterceptor());
- wire.addInvocationChain(operation, chain);
+ wire.addInboundInvocationChain(operation, chain);
assertFalse(WireUtils.isOptimizable(component, wire));
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Tue Feb 13 12:31:48 2007
@@ -89,9 +89,9 @@
EasyMock.replay(invoker);
InboundWire wire = wireService.createWire(definition);
assertEquals("service#foo", wire.getSourceUri().toString());
- assertEquals(1, wire.getInvocationChains().size());
+ assertEquals(1, wire.getInboundInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
- InboundInvocationChain chain = wire.getInvocationChains().get(operation);
+ InboundInvocationChain chain = wire.getInboundInvocationChains().get(operation);
assertEquals(operation, chain.getOperation());
// verify the chain is invokable
MessageImpl msg = new MessageImpl();
@@ -108,9 +108,9 @@
OutboundWire wire = wireService.createWire(target, definition).get(0);
assertEquals("#refName", wire.getSourceUri().toString());
- assertEquals(1, wire.getInvocationChains().size());
+ assertEquals(1, wire.getOutboundInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
- OutboundInvocationChain chain = wire.getInvocationChains().get(operation);
+ OutboundInvocationChain chain = wire.getOutboundInvocationChains().get(operation);
assertEquals(operation, chain.getOperation());
assertNull(chain.getHeadInterceptor());
assertEquals(1, wire.getTargetCallbackInvocationChains().size());
@@ -186,12 +186,12 @@
wireService.createWires(binding, contract, URI.create("target"));
InboundWire inboundWire = binding.getInboundWire();
- assertEquals(1, inboundWire.getInvocationChains().size());
+ assertEquals(1, inboundWire.getInboundInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
assertEquals(uri, inboundWire.getSourceUri());
OutboundWire outboundWire = binding.getOutboundWire();
- assertEquals(1, outboundWire.getInvocationChains().size());
+ assertEquals(1, outboundWire.getOutboundInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(uri, outboundWire.getSourceUri());
}
@@ -202,11 +202,11 @@
wireService.createWires(binding, contract, "target");
InboundWire inboundWire = binding.getInboundWire();
- assertEquals(1, inboundWire.getInvocationChains().size());
+ assertEquals(1, inboundWire.getInboundInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
assertEquals(uri, inboundWire.getSourceUri());
OutboundWire outboundWire = binding.getOutboundWire();
- assertEquals(1, outboundWire.getInvocationChains().size());
+ assertEquals(1, outboundWire.getOutboundInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(uri, outboundWire.getSourceUri());
assertEquals(1, outboundWire.getTargetCallbackInvocationChains().size());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java Tue Feb 13 12:31:48 2007
@@ -41,7 +41,7 @@
OutboundWire wire = new OutboundWireImpl();
Operation<Type> op = new Operation<Type>("hello", null, null, null);
OutboundInvocationChain chain = new OutboundInvocationChainImpl(op);
- wire.addInvocationChain(op, chain);
+ wire.addOutboundInvocationChain(op, chain);
Map<Method, OutboundChainHolder> chains = WireUtils.createInterfaceToWireMapping(Foo.class, wire);
assertEquals(1, chains.size());
assertNotNull(chains.get(m));
@@ -51,7 +51,7 @@
OutboundWire wire = new OutboundWireImpl();
Operation<Type> op = new Operation<Type>("goodbye", null, null, null);
OutboundInvocationChain chain = new OutboundInvocationChainImpl(op);
- wire.addInvocationChain(op, chain);
+ wire.addOutboundInvocationChain(op, chain);
try {
WireUtils.createInterfaceToWireMapping(Foo.class, wire);
fail();
@@ -64,7 +64,7 @@
InboundWire wire = new InboundWireImpl();
Operation<Type> op = new Operation<Type>("hello", null, null, null);
InboundInvocationChain chain = new InboundInvocationChainImpl(op);
- wire.addInvocationChain(op, chain);
+ wire.addInboundInvocationChain(op, chain);
Map<Method, InboundInvocationChain> chains = WireUtils.createInboundMapping(wire, new Method[]{m});
assertEquals(1, chains.size());
assertNotNull(chains.get(m));
@@ -74,7 +74,7 @@
InboundWire wire = new InboundWireImpl();
Operation<Type> op = new Operation<Type>("goodbye", null, null, null);
InboundInvocationChain chain = new InboundInvocationChainImpl(op);
- wire.addInvocationChain(op, chain);
+ wire.addInboundInvocationChain(op, chain);
try {
WireUtils.createInboundMapping(wire, new Method[]{m});
fail();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java?view=diff&rev=507198&r1=507197&r2=507198
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java Tue Feb 13 12:31:48 2007
@@ -77,7 +77,7 @@
URI uri = URI.create("component#foo");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
- EasyMock.expect(wire.getInvocationChains()).andReturn(map).times(2);
+ EasyMock.expect(wire.getInboundInvocationChains()).andReturn(map).times(2);
EasyMock.replay(wire);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getInboundWire(EasyMock.eq("foo"))).andReturn(wire);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org