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:37:08 UTC
svn commit: r507203 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/wire/
core/src/test/java/org/apache/tuscany/core/integration/mock/
core/src/test/java/org/apache/tuscany/core/wire/
core/src/test/java/org/apache/tu...
Author: jmarino
Date: Tue Feb 13 12:37:05 2007
New Revision: 507203
URL: http://svn.apache.org/viewvc?view=rev&rev=507203
Log:
remove InboundWire.getInvocationChains()
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.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/InboundInvocationErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
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=507203&r1=507202&r2=507203
==============================================================================
--- 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:37:05 2007
@@ -106,10 +106,6 @@
return chains;
}
- public void addInvocationChains(Map<Operation<?>, InboundInvocationChain> chains) {
- this.chains.putAll(chains);
- }
-
public void addInboundInvocationChain(Operation<?> operation, InboundInvocationChain chain) {
chains.put(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=507203&r1=507202&r2=507203
==============================================================================
--- 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:37:05 2007
@@ -204,7 +204,7 @@
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
wire.setServiceContract(contract);
wire.setSourceUri(URI.create("#" + serviceName));
- wire.addInvocationChains(createInboundChains(interfaze, interceptor));
+ createInboundChains(interfaze, interceptor, wire);
return wire;
}
@@ -251,11 +251,9 @@
}
}
- private static Map<Operation<?>, InboundInvocationChain> createInboundChains(Class<?> interfaze,
- Interceptor interceptor)
+ private static void createInboundChains(Class<?> interfaze, Interceptor interceptor, InboundWire wire)
throws InvalidServiceContractException {
- Map<Operation<?>, InboundInvocationChain> invocations = new HashMap<Operation<?>, InboundInvocationChain>();
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
for (Operation<?> method : contract.getOperations().values()) {
InboundInvocationChain chain = new InboundInvocationChainImpl(method);
@@ -264,9 +262,8 @@
}
// add tail interceptor
chain.addInterceptor(new InvokerInterceptor());
- invocations.put(method, chain);
+ wire.addInboundInvocationChain(method, chain);
}
- return invocations;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java?view=diff&rev=507203&r1=507202&r2=507203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java Tue Feb 13 12:37:05 2007
@@ -21,8 +21,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
import java.net.URI;
import org.apache.tuscany.spi.component.WorkContext;
@@ -86,11 +84,9 @@
Operation<Type> operation =
new Operation<Type>("checkedException", null, null, null, false, null, NO_CONVERSATION);
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(operation, createChain(checkedMethod, checkedOperation));
InboundWire wire = new InboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
- wire.addInvocationChains(chains);
+ wire.addInboundInvocationChain(operation, createChain(checkedMethod, checkedOperation));
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
@@ -111,11 +107,9 @@
Operation<Type> operation =
new Operation<Type>("runtimeException", null, null, null, false, null, NO_CONVERSATION);
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(operation, createChain(runtimeMethod, runtimeOperation));
InboundWire wire = new InboundWireImpl();
wire.setSourceUri(URI.create("#wire"));
- wire.addInvocationChains(chains);
+ wire.addInboundInvocationChain(operation, createChain(runtimeMethod, runtimeOperation));
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java?view=diff&rev=507203&r1=507202&r2=507203
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java Tue Feb 13 12:37:05 2007
@@ -23,9 +23,7 @@
import java.lang.reflect.Type;
import java.net.URI;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -149,10 +147,8 @@
DataType<List<DataType<Type>>> inputType =
new DataType<List<DataType<Type>>>(Object[].class, types);
Operation<Type> operation = new Operation<Type>("echo", inputType, null, null, false, null, NO_CONVERSATION);
- Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
- chains.put(operation, chain);
InboundWire wire = new InboundWireImpl();
- wire.addInvocationChains(chains);
+ wire.addInboundInvocationChain(operation, chain);
wire.setServiceContract(new ServiceContract<SimpleTarget>(SimpleTarget.class) {
});
wire.setSourceUri(URI.create("foo#bar"));
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java?view=diff&rev=507203&r1=507202&r2=507203
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java Tue Feb 13 12:37:05 2007
@@ -38,11 +38,6 @@
Map<Operation<?>, InboundInvocationChain> getInboundInvocationChains();
/**
- * Adds the collection of invocation chains keyed by operation
- */
- void addInvocationChains(Map<Operation<?>, InboundInvocationChain> chains);
-
- /**
* Adds the invocation chain associated with the given operation
*/
void addInboundInvocationChain(Operation<?> operation, InboundInvocationChain chain);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org