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:01:19 UTC
svn commit: r507188 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/wire/
core/src/test/java/org/apache/tuscany/core/builder/
core/src/test/java/org/apache/tuscany/core/implementation/java/integration/
core/src/test/...
Author: jmarino
Date: Tue Feb 13 12:01:17 2007
New Revision: 507188
URL: http://svn.apache.org/viewvc?view=rev&rev=507188
Log:
remove addTargetInvocationChains and addTargetCallbackInvocationChains from OutboundWire
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.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/SynchronousForwardCallbackConnectionTestCase.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/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -114,20 +114,12 @@
return chains;
}
- public void addInvocationChains(Map<Operation<?>, OutboundInvocationChain> chains) {
- this.chains.putAll(chains);
- }
-
public void addInvocationChain(Operation<?> operation, OutboundInvocationChain chain) {
chains.put(operation, chain);
}
public Map<Operation<?>, InboundInvocationChain> getTargetCallbackInvocationChains() {
return callbackTargetChains;
- }
-
- public void addTargetCallbackInvocationChains(Map<Operation<?>, InboundInvocationChain> chains) {
- callbackTargetChains.putAll(chains);
}
public void addTargetCallbackInvocationChain(Operation operation, InboundInvocationChain chain) {
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -92,9 +92,7 @@
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain
.addInterceptor(new NonBlockingForwardNonBlockingCallbackConnectionTestCase.MockInterceptor());
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(callbackOperation, callbackInboundChain);
- outboundWire.addTargetCallbackInvocationChains(chains);
+ outboundWire.addTargetCallbackInvocationChain(callbackOperation, callbackInboundChain);
connector.connect(source, outboundWire, target, inboundWire, true);
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -90,9 +90,7 @@
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new NonBlockingForwardSyncCallbackConnectionTestCase.MockInterceptor());
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(callbackOperation, callbackInboundChain);
- outboundWire.addTargetCallbackInvocationChains(chains);
+ outboundWire.addTargetCallbackInvocationChain(callbackOperation, callbackInboundChain);
connector.connect(source, outboundWire, target, inboundWire, true);
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -89,9 +89,7 @@
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new MockInterceptor());
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(callbackOperation, callbackInboundChain);
- outboundWire.addTargetCallbackInvocationChains(chains);
+ outboundWire.addTargetCallbackInvocationChain(callbackOperation, callbackInboundChain);
connector.connect(source, outboundWire, target, inboundWire, true);
@@ -139,9 +137,7 @@
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new MockInterceptor());
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(callbackOperation, callbackInboundChain);
- outboundWire.addTargetCallbackInvocationChains(chains);
+ outboundWire.addTargetCallbackInvocationChain(callbackOperation, callbackInboundChain);
connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
@@ -195,9 +191,7 @@
InboundInvocationChain callbackInboundChain = new InboundInvocationChainImpl(callbackOperation);
callbackInboundChain.addInterceptor(new MockInterceptor());
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(callbackOperation, callbackInboundChain);
- outboundWire.addTargetCallbackInvocationChains(chains);
+ outboundWire.addTargetCallbackInvocationChain(callbackOperation, callbackInboundChain);
connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.implementation.java.integration;
import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
@@ -213,22 +211,20 @@
JavaServiceContract contract = new JavaServiceContract(interfaze);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
wire.setServiceContract(contract);
- wire.addInvocationChains(createInvocationChains(interfaze));
+ createChains(interfaze, wire);
wire.setTargetUri(URI.create(targetName));
wire.setUri(URI.create("component#ref"));
return wire;
}
- private static Map<Operation<?>, OutboundInvocationChain> createInvocationChains(Class<?> interfaze)
+ private static void createChains(Class<?> interfaze, OutboundWire wire)
throws InvalidServiceContractException {
- Map<Operation<?>, OutboundInvocationChain> invocations = new HashMap<Operation<?>, OutboundInvocationChain>();
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
ServiceContract<?> contract = registry.introspect(interfaze);
for (Operation operation : contract.getOperations().values()) {
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
- invocations.put(operation, chain);
+ wire.addInvocationChain(operation, chain);
}
- return invocations;
}
}
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=507188&r1=507187&r2=507188
==============================================================================
--- 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:01:17 2007
@@ -218,8 +218,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.setUri(URI.create("#" + refName));
- Map<Operation<?>, OutboundInvocationChain> outboundChains = createOutboundChains(interfaze, interceptor);
- wire.addInvocationChains(outboundChains);
+ createOutboundChains(interfaze, interceptor, wire);
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
wire.setServiceContract(contract);
return wire;
@@ -240,19 +239,16 @@
return component;
}
- private static Map<Operation<?>, OutboundInvocationChain> createOutboundChains(Class<?> interfaze,
- Interceptor interceptor)
+ private static void createOutboundChains(Class<?> interfaze, Interceptor interceptor, OutboundWire wire)
throws InvalidServiceContractException {
- Map<Operation<?>, OutboundInvocationChain> invocations = new HashMap<Operation<?>, OutboundInvocationChain>();
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
for (Operation<?> operation : contract.getOperations().values()) {
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
if (interceptor != null) {
chain.addInterceptor(interceptor);
}
- invocations.put(operation, chain);
+ wire.addInvocationChain(operation, chain);
}
- return invocations;
}
private static Map<Operation<?>, InboundInvocationChain> createInboundChains(Class<?> interfaze,
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java?view=diff&rev=507188&r1=507187&r2=507188
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java Tue Feb 13 12:01:17 2007
@@ -53,11 +53,6 @@
Map<Operation<?>, OutboundInvocationChain> getInvocationChains();
/**
- * Adds the collection of invocation chains keyed by operation
- */
- void addInvocationChains(Map<Operation<?>, OutboundInvocationChain> chains);
-
- /**
* Adds the invocation chain associated with the given operation
*/
void addInvocationChain(Operation<?> operation, OutboundInvocationChain chain);
@@ -67,11 +62,6 @@
* target service.
*/
Map<Operation<?>, InboundInvocationChain> getTargetCallbackInvocationChains();
-
- /**
- * Adds the collection of callback invocation chains keyed by operation
- */
- void addTargetCallbackInvocationChains(Map<Operation<?>, InboundInvocationChain> chains);
/**
* Adds the callback invocation chain associated with the given operation
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org