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:58:42 UTC
svn commit: r519543 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/java/
test/java/org/apache/tuscany/core/implementation/java/
Author: jboynes
Date: Sat Mar 17 21:58:41 2007
New Revision: 519543
URL: http://svn.apache.org/viewvc?view=rev&rev=519543
Log:
remove WorkContext from JavaTargetInvoker constructor
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
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/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java?view=diff&rev=519543&r1=519542&r2=519543
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaAtomicComponent.java Sat Mar 17 21:58:41 2007
@@ -54,7 +54,7 @@
}
try {
Method method = JavaIDLUtils.findMethod(implClass, operation);
- return new JavaTargetInvoker(method, this, scopeContainer, workContext);
+ return new JavaTargetInvoker(method, this, scopeContainer);
} catch (NoSuchMethodException e) {
throw new TargetMethodNotFoundException(operation);
}
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=519543&r1=519542&r2=519543
==============================================================================
--- 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:58:41 2007
@@ -45,8 +45,8 @@
public JavaTargetInvoker(Method operation,
AtomicComponent<T> component,
- ScopeContainer scopeContainer,
- WorkContext context) {
+ ScopeContainer scopeContainer
+ ) {
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/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java?view=diff&rev=519543&r1=519542&r2=519543
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java Sat Mar 17 21:58:41 2007
@@ -83,13 +83,13 @@
}
public void testObjectInvoke() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer);
Object ret = invoker.invokeTarget("foo", NONE, context);
assertEquals("foo", ret);
}
public void testArrayInvoke() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, scopeContainer);
String[] args = new String[]{"foo", "bar"};
Object ret = invoker.invokeTarget(new Object[]{args}, NONE, context);
String[] retA = (String[]) ret;
@@ -100,21 +100,21 @@
}
public void testNullInvoke() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, scopeContainer);
Object ret = invoker.invokeTarget(null, NONE, context);
String retS = (String) ret;
assertEquals("foo", retS);
}
public void testPrimitiveInvoke() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, scopeContainer);
Object ret = invoker.invokeTarget(new Integer[]{1}, NONE, context);
Integer retI = (Integer) ret;
assertEquals(1, retI.intValue());
}
public void testInvokeCheckedException() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, scopeContainer);
try {
invoker.invokeTarget(null, NONE, context);
fail(TestException.class.getName() + " should have been thrown");
@@ -124,7 +124,7 @@
}
public void testInvokeRuntimeException() throws Throwable {
- JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, scopeContainer, context);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, scopeContainer);
try {
invoker.invokeTarget(null, NONE, context);
fail(TestException.class.getName() + " should have been thrown");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java?view=diff&rev=519543&r1=519542&r2=519543
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java Sat Mar 17 21:58:41 2007
@@ -69,7 +69,7 @@
EasyMock.expect(scopeContainer.getScope()).andStubReturn(Scope.CONVERSATION);
EasyMock.replay(scopeContainer);
- invoker = new JavaTargetInvoker(method, component, scopeContainer, workContext);
+ invoker = new JavaTargetInvoker(method, component, scopeContainer);
EasyMock.reset(scopeContainer);
EasyMock.expect(scopeContainer.getScope()).andStubReturn(Scope.CONVERSATION);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java?view=diff&rev=519543&r1=519542&r2=519543
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerStatelessDestroyTestCase.java Sat Mar 17 21:58:41 2007
@@ -42,7 +42,7 @@
EasyMock.replay(component);
EasyMock.replay(scopeContainer);
EasyMock.replay(wrapper);
- JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer, workContext);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, scopeContainer);
invoker.setCacheable(false);
assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE, workContext));
EasyMock.verify(component);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org