You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/18 05:56:05 UTC
svn commit: r519542 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/java/
core/src/test/java/org/apache/tuscany/core/wire/jdk/
spi/src/main/java/org/apache/tuscany/spi/extension/ spi/src/test/java/org/...
Author: jboynes
Date: Sat Mar 17 21:56:05 2007
New Revision: 519542
URL: http://svn.apache.org/viewvc?view=rev&rev=519542
Log:
remove WorkContext instance variable from JavaTargetInvoker
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java?view=diff&rev=519542&r1=519541&r2=519542
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java Sat Mar 17 21:56:05 2007
@@ -47,7 +47,6 @@
AtomicComponent<T> component,
ScopeContainer scopeContainer,
WorkContext context) {
- super(context);
assert operation != null : "Operation method cannot be null";
this.operation = operation;
this.component = component;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java?view=diff&rev=519542&r1=519541&r2=519542
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerTestCase.java Sat Mar 17 21:56:05 2007
@@ -40,7 +40,7 @@
import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
+
import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.WireImpl;
@@ -88,7 +88,7 @@
WorkContext wc = new SimpleWorkContext();
PojoWorkContextTunnel.setThreadWorkContext(wc);
try {
- MockInvoker invoker = new MockInvoker(wc);
+ MockInvoker invoker = new MockInvoker();
InvocationChain chain = new InvocationChainImpl(op1);
chain.setTargetInvoker(invoker);
@@ -121,20 +121,15 @@
private class MockInvoker implements TargetInvoker {
- private WorkContext wc;
private String currentConversationID;
- public MockInvoker(WorkContext wc) {
- this.wc = wc;
- }
-
public void setCurrentConversationID(String id) {
currentConversationID = id;
}
public Object invokeTarget(final Object payload, final short sequence, WorkContext workContext) throws InvocationTargetException {
assertEquals("bar", Array.get(payload, 0));
- String convID = (String) wc.getIdentifier(Scope.CONVERSATION);
+ String convID = (String) workContext.getIdentifier(Scope.CONVERSATION);
assertSame(convID, currentConversationID);
return "response";
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java?view=diff&rev=519542&r1=519541&r2=519542
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/TargetInvokerExtension.java Sat Mar 17 21:56:05 2007
@@ -33,17 +33,7 @@
* @version $Rev$ $Date$
*/
public abstract class TargetInvokerExtension implements TargetInvoker {
- protected WorkContext workContext;
protected boolean cacheable;
-
- /**
- * Creates a new invoker
- *
- * @param workContext the work context to use for setting correlation information
- */
- public TargetInvokerExtension(WorkContext workContext) {
- this.workContext = workContext;
- }
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java?view=diff&rev=519542&r1=519541&r2=519542
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java Sat Mar 17 21:56:05 2007
@@ -48,7 +48,7 @@
Target target = EasyMock.createMock(Target.class);
target.invokeStart("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(context, monitor, target);
+ Invoker invoker = new Invoker(target);
Message msg = new MessageImpl();
msg.setWorkContext(context);
msg.pushCallbackUri(from);
@@ -73,7 +73,7 @@
Target target = EasyMock.createMock(Target.class);
target.invokeContinue("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(context, monitor, target);
+ Invoker invoker = new Invoker(target);
Message msg = new MessageImpl();
msg.setWorkContext(context);
msg.pushCallbackUri(from);
@@ -98,7 +98,7 @@
Target target = EasyMock.createMock(Target.class);
target.invokeEnd("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(context, monitor, target);
+ Invoker invoker = new Invoker(target);
Message msg = new MessageImpl();
msg.setWorkContext(context);
msg.pushCallbackUri(from);
@@ -119,11 +119,10 @@
context = EasyMock.createMock(WorkContext.class);
context.setCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
- ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invokeNone("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(context, monitor, target);
+ Invoker invoker = new Invoker(target);
Message msg = new MessageImpl();
msg.setWorkContext(context);
msg.pushCallbackUri(from);
@@ -142,8 +141,7 @@
private class Invoker extends TargetInvokerExtension {
private Target target;
- public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
- super(workContext);
+ private Invoker(Target target) {
this.target = target;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java?view=diff&rev=519542&r1=519541&r2=519542
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java Sat Mar 17 21:56:05 2007
@@ -44,11 +44,10 @@
context = EasyMock.createMock(WorkContext.class);
context.setCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
- ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invoke("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(context, monitor, target);
+ Invoker invoker = new Invoker(target);
Message msg = new MessageImpl();
msg.setWorkContext(context);
msg.pushCallbackUri(from);
@@ -67,8 +66,7 @@
private class Invoker extends TargetInvokerExtension {
private Target target;
- public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
- super(workContext);
+ private Invoker(Target target) {
this.target = target;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org