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 2006/12/05 04:10:34 UTC
svn commit: r482469 - in /incubator/tuscany/java/sca/kernel:
core/src/test/java/org/apache/tuscany/core/integration/conversation/
core/src/test/java/org/apache/tuscany/core/wire/jdk/
spi/src/main/java/org/apache/tuscany/spi/builder/ spi/src/main/java/o...
Author: jmarino
Date: Mon Dec 4 19:10:33 2006
New Revision: 482469
URL: http://svn.apache.org/viewvc?view=rev&rev=482469
Log:
fix build and checkstyle violations
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java Mon Dec 4 19:10:33 2006
@@ -30,7 +30,6 @@
import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.services.store.memory.MemoryStore;
-import org.apache.tuscany.core.wire.ConversationWirePostProcessor;
import org.easymock.classextension.EasyMock;
/**
@@ -49,9 +48,6 @@
protected void createRuntime() {
workContext = new WorkContextImpl();
WirePostProcessorRegistry processorRegistry = new WirePostProcessorRegistryImpl();
- ConversationWirePostProcessor processor = new ConversationWirePostProcessor();
- processor.setRegistry(processorRegistry);
- processor.init();
connector = new ConnectorImpl(null, processorRegistry, null, workContext);
store = new MemoryStore(EasyMock.createNiceMock(StoreMonitor.class));
container = new ConversationalScopeContainer(store, workContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Mon Dec 4 19:10:33 2006
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.integration.conversation;
import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.lang.reflect.Method;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
@@ -27,16 +27,14 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.TargetNotFoundException;
-import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
+import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
import org.easymock.classextension.EasyMock;
/**
@@ -45,20 +43,17 @@
* @version $Rev$ $Date$
*/
public class ConversationIdleExpireTestCase extends AbstractConversationTestCase {
+ private JDKOutboundInvocationHandler handler;
private OutboundWire owire;
private Foo targetInstance;
+ private Method operation1;
+ private Method operation2;
private final Object mutex = new Object();
- public void testConversationExpire() throws Exception {
+ public void testConversationExpire() throws Throwable {
workContext.setIdentifier(org.apache.tuscany.spi.model.Scope.CONVERSATION, "12345A");
// start the conversation
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation1".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- entry.getValue().getHeadInterceptor().invoke(msg);
- }
- }
+ handler.invoke(operation1, null);
// verify the instance was persisted
assertEquals(targetInstance, store.readRecord(target, "12345A"));
synchronized (mutex) {
@@ -66,19 +61,12 @@
}
// verify the instance was expired
assertNull(store.readRecord(target, "12345A"));
-
- // continue the conversation - should throw an error
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation2".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- try {
- entry.getValue().getHeadInterceptor().invoke(msg);
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
- }
+ // continue the conversation - should throw an error
+ try {
+ handler.invoke(operation2, null);
+ fail();
+ } catch (TargetNotFoundException e) {
+ // expected
}
}
@@ -97,7 +85,7 @@
target = createMaxIdleTimeAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source");
+ EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
@@ -106,6 +94,9 @@
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
+ handler = new JDKOutboundInvocationHandler(owire, workContext);
+ operation1 = Foo.class.getMethod("operation1");
+ operation2 = Foo.class.getMethod("operation2");
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Mon Dec 4 19:10:33 2006
@@ -19,7 +19,7 @@
package org.apache.tuscany.core.integration.conversation;
import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.lang.reflect.Method;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
@@ -27,16 +27,14 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.TargetNotFoundException;
-import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
+import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
import org.easymock.classextension.EasyMock;
/**
@@ -45,20 +43,17 @@
* @version $Rev$ $Date$
*/
public class ConversationMaxAgeExpireTestCase extends AbstractConversationTestCase {
+ private JDKOutboundInvocationHandler handler;
private OutboundWire owire;
- private ConversationMaxAgeExpireTestCase.Foo targetInstance;
+ private Foo targetInstance;
+ private Method operation1;
+ private Method operation2;
private final Object mutex = new Object();
- public void testConversationExpire() throws Exception {
+ public void testConversationExpire() throws Throwable {
workContext.setIdentifier(org.apache.tuscany.spi.model.Scope.CONVERSATION, "12345A");
// start the conversation
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation1".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- entry.getValue().getHeadInterceptor().invoke(msg);
- }
- }
+ handler.invoke(operation1, null);
// verify the instance was persisted
assertEquals(targetInstance, store.readRecord(target, "12345A"));
synchronized (mutex) {
@@ -66,19 +61,12 @@
}
// verify the instance was expired
assertNull(store.readRecord(target, "12345A"));
-
// continue the conversation - should throw an error
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation2".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- try {
- entry.getValue().getHeadInterceptor().invoke(msg);
- fail();
- } catch (TargetNotFoundException e) {
- // expected
- }
- }
+ try {
+ handler.invoke(operation2, null);
+ fail();
+ } catch (TargetNotFoundException e) {
+ // expected
}
}
@@ -97,7 +85,7 @@
target = createMaxIdleTimeAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source");
+ EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", ConversationMaxAgeExpireTestCase.Foo.class);
@@ -106,6 +94,9 @@
InboundWire iwire = MockFactory.createInboundWire("foo", ConversationMaxAgeExpireTestCase.Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
+ handler = new JDKOutboundInvocationHandler(owire, workContext);
+ operation1 = Foo.class.getMethod("operation1");
+ operation2 = Foo.class.getMethod("operation2");
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Mon Dec 4 19:10:33 2006
@@ -19,24 +19,22 @@
package org.apache.tuscany.core.integration.conversation;
import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.lang.reflect.Method;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
+import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
import org.easymock.classextension.EasyMock;
/**
@@ -50,37 +48,23 @@
public class ConversationStartStopEndTestCase extends AbstractConversationTestCase {
private OutboundWire owire;
private Foo targetInstance;
+ private JDKOutboundInvocationHandler handler;
+ private Method operation1;
+ private Method operation2;
+ private Method endOperation;
- public void testConversationStartContinueEnd() throws Exception {
+ public void testConversationStartContinueEnd() throws Throwable {
workContext.setIdentifier(CONVERSATION, "12345A");
// start the conversation
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation1".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- entry.getValue().getHeadInterceptor().invoke(msg);
- }
- }
+ handler.invoke(operation1, null);
// verify the instance was persisted
assertEquals(targetInstance, store.readRecord(target, "12345A"));
// continue the conversation
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("operation2".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- entry.getValue().getHeadInterceptor().invoke(msg);
- }
- }
+ handler.invoke(operation2, null);
// verify the instance was persisted
assertEquals(targetInstance, store.readRecord(target, "12345A"));
// end the conversation
- for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : owire.getInvocationChains().entrySet()) {
- if ("end".equals(entry.getKey().getName())) {
- MessageImpl msg = new MessageImpl();
- msg.setTargetInvoker(entry.getValue().getTargetInvoker());
- entry.getValue().getHeadInterceptor().invoke(msg);
- }
- }
+ handler.invoke(endOperation, null);
workContext.clearIdentifier(CONVERSATION);
EasyMock.verify(targetInstance);
// verify the store has removed the instance
@@ -101,7 +85,7 @@
target = createAtomicComponent();
// create source component mock
JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getName()).andReturn("source");
+ EasyMock.expect(source.getName()).andReturn("source").atLeastOnce();
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
@@ -110,6 +94,10 @@
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
iwire.setContainer(target);
connector.connect(owire, iwire, false);
+ handler = new JDKOutboundInvocationHandler(owire, workContext);
+ operation1 = Foo.class.getMethod("operation1");
+ operation2 = Foo.class.getMethod("operation2");
+ endOperation = Foo.class.getMethod("end");
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java Mon Dec 4 19:10:33 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.core.wire.jdk;
-import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -34,6 +32,7 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
+import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
@@ -84,7 +83,8 @@
wire = EasyMock.createMock(OutboundWire.class);
Map<Operation<?>, OutboundInvocationChain> map = new HashMap<Operation<?>, OutboundInvocationChain>();
Operation<Object> operation = new Operation<Object>("invoke", null, null, null, false, null, NO_CONVERSATION);
- ServiceContract<Object> opContract = new ServiceContract<Object>() {};
+ ServiceContract<Object> opContract = new ServiceContract<Object>() {
+ };
contract.setInterfaceClass(Foo.class);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
operation.setServiceContract(opContract);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java Mon Dec 4 19:10:33 2006
@@ -34,8 +34,9 @@
* chains.
*
* @param source the source, i.e. a <code>Service</code>, <code>Component</code>, or <code>Reference</code>
+ * @throws BuilderConfigException
*/
- void connect(SCAObject source);
+ void connect(SCAObject source) throws BuilderConfigException;
/**
* Bridges the invocation chains associated with an inbound and outbound wire.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java?view=diff&rev=482469&r1=482468&r2=482469
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandler.java Mon Dec 4 19:10:33 2006
@@ -23,6 +23,7 @@
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.ServiceContract;
/**
* Base class for performing invocations on an outbound chain. Subclasses are responsible for retrieving and supplying
@@ -31,8 +32,7 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractOutboundInvocationHandler {
-
- private boolean conversationStarted = false;
+ private boolean conversationStarted;
protected Object invoke(OutboundInvocationChain chain,
TargetInvoker invoker,
@@ -70,7 +70,9 @@
if (callbackRoutingChain != null) {
msg.setCallbackRoutingChain(callbackRoutingChain);
}
- if (InteractionScope.CONVERSATIONAL.equals(chain.getOperation().getServiceContract().getInteractionScope())) {
+ Operation operation = chain.getOperation();
+ ServiceContract contract = operation.getServiceContract();
+ if (InteractionScope.CONVERSATIONAL.equals(contract.getInteractionScope())) {
int sequence = chain.getOperation().getConversationSequence();
if (sequence == Operation.CONVERSATION_END) {
msg.setConversationSequence(TargetInvoker.END);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org