Author: jsdelfino
Date: Sun Sep 16 19:07:54 2007
New Revision: 576235
URL: http://svn.apache.org/viewvc?rev=576235&view=rev
Log:
Fix for TUSCANY-1704, cleaned up obsolete methods from
oat.sca.invocation.Message.
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
Sun Sep 16 19:07:54 2007
@@ -41,22 +41,6 @@
<T> void setBody(T body);
/**
- * @deprecated
- * Get the conversation id
- * @return The conversation ID
- */
- @Deprecated
- Object getConversationID();
-
- /**
- * @deprecated
- * Set the conversation id
- * @param conversationId The conversation ID
- */
- @Deprecated
- void setConversationID(Object conversationId);
-
- /**
* Get the end point reference of the source reference
* @return The end point reference of the reference originating the message
*/
@@ -80,9 +64,6 @@
*/
void setTo(EndpointReference to);
- EndpointReference getReplyTo();
- void setReplyTo(EndpointReference replyTo);
-
/**
* Returns the id of the message
* @return The message Id
@@ -94,21 +75,6 @@
* @param messageId The message ID
*/
void setMessageID(Object messageId);
-
- /**
- * Returns the correlation id of the message or null if one is not
available. Correlation ids are used by transports
- * for message routing.
- * @return The correlation Id
- */
- @Deprecated
- Object getCorrelationID();
-
- /**
- * Sets the correlation id of the message. Correlation ids are used by
transports for message routing.
- * @param correlationId The correlation Id
- */
- @Deprecated
- void setCorrelationID(Object correlationId);
/**
* Determines if the message represents a fault/exception
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
Sun Sep 16 19:07:54 2007
@@ -31,13 +31,11 @@
public class MessageImpl implements Message {
private Object body;
private Object messageID;
- private Object correlationID;
private boolean isFault;
private Operation operation;
private EndpointReference from;
private EndpointReference to;
- private EndpointReference replyTo;
public MessageImpl() {
this.from = new EndpointReferenceImpl("/");
@@ -54,14 +52,6 @@
this.body = body;
}
- public Object getConversationID() {
- return getTo().getReferenceParameters().getConversationID();
- }
-
- public void setConversationID(Object conversationID) {
- getTo().getReferenceParameters().setConversationID(conversationID);
- }
-
public Object getMessageID() {
return messageID;
}
@@ -70,14 +60,6 @@
this.messageID = messageId;
}
- public Object getCorrelationID() {
- return correlationID;
- }
-
- public void setCorrelationID(Object correlationId) {
- this.correlationID = correlationId;
- }
-
public boolean isFault() {
return isFault;
}
@@ -109,20 +91,6 @@
public void setOperation(Operation op) {
this.operation = op;
- }
-
- /**
- * @return the replyTo
- */
- public EndpointReference getReplyTo() {
- return replyTo;
- }
-
- /**
- * @param replyTo the replyTo to set
- */
- public void setReplyTo(EndpointReference replyTo) {
- this.replyTo = replyTo;
}
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
Sun Sep 16 19:07:54 2007
@@ -61,18 +61,10 @@
}
public Message invoke(final Message msg) {
- // Retrieve conversation id to transfer to new thread
- // Notice that we cannot clear the conversation id from the current
thread
- final Object conversationID =
ThreadMessageContext.getMessageContext().getConversationID();
// Schedule the invocation of the next interceptor in a new Work
instance
try {
workScheduler.scheduleWork(new Runnable() {
public void run() {
- msg.setCorrelationID(null);
- // if we got a conversation id, transfer it to new thread
- if (conversationID != null) {
- msg.setConversationID(conversationID);
- }
Message context =
ThreadMessageContext.setMessageContext(msg);
try {
next.invoke(msg);
@@ -100,18 +92,6 @@
*/
private static class ImmutableMessage implements Message {
- public String getConversationID() {
- return null;
- }
-
- public RuntimeWire getWire() {
- return null;
- }
-
- public void setConversationID(Object conversationId) {
- throw new UnsupportedOperationException();
- }
-
@SuppressWarnings("unchecked")
public Object getBody() {
return null;
@@ -135,14 +115,6 @@
throw new UnsupportedOperationException();
}
- public Object getCorrelationID() {
- return null;
- }
-
- public void setCorrelationID(Object correlationId) {
- throw new UnsupportedOperationException();
- }
-
public boolean isFault() {
return false;
}
@@ -180,13 +152,6 @@
*/
public EndpointReference getReplyTo() {
return null;
- }
-
- /**
- * @see
org.apache.tuscany.sca.invocation.Message#setReplyTo(org.apache.tuscany.sca.runtime.EndpointReference)
- */
- public void setReplyTo(EndpointReference replyTo) {
- throw new UnsupportedOperationException();
}
}
Modified:
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
Sun Sep 16 19:07:54 2007
@@ -51,13 +51,14 @@
});
replay(scheduler);
Message context = createMock(Message.class);
- String convID = "convID";
- EasyMock.expect(context.getConversationID()).andReturn(convID);
+ //String convID = "convID";
+ //TODO port to the new way of dealing with conversation IDs later
+ //EasyMock.expect(context.getConversationID()).andReturn(convID);
EasyMock.replay(context);
ThreadMessageContext.setMessageContext(context);
Message msg = createMock(Message.class);
- msg.setCorrelationID(null);
- msg.setConversationID(convID);
+ //TODO port to the new way of dealing with conversation IDs later
+ //msg.setConversationID(convID);
Interceptor next = EasyMock.createMock(Interceptor.class);
EasyMock.expect(next.invoke(EasyMock.eq(msg))).andReturn(msg);
EasyMock.replay(next);
Modified:
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
Sun Sep 16 19:07:54 2007
@@ -27,6 +27,7 @@
}
public Object getInstance() {
- return ThreadMessageContext.getMessageContext().getConversationID();
+ return
ThreadMessageContext.getMessageContext().getTo().getReferenceParameters().getConversationID();
+
}
}
Modified:
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java?rev=576235&r1=576234&r2=576235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
Sun Sep 16 19:07:54 2007
@@ -32,14 +32,6 @@
return null;
}
- public Object getConversationID() {
- return null;
- }
-
- public Object getCorrelationID() {
- return null;
- }
-
public EndpointReference getFrom() {
return null;
}
@@ -64,14 +56,6 @@
throw new UnsupportedOperationException();
}
- public void setConversationID(Object arg0) {
- throw new UnsupportedOperationException();
- }
-
- public void setCorrelationID(Object arg0) {
- throw new UnsupportedOperationException();
- }
-
public <T> void setFaultBody(T arg0) {
throw new UnsupportedOperationException();
}
@@ -103,10 +87,4 @@
return null;
}
- /**
- * @see
org.apache.tuscany.sca.invocation.Message#setReplyTo(org.apache.tuscany.sca.runtime.EndpointReference)
- */
- public void setReplyTo(EndpointReference replyTo) {
- throw new UnsupportedOperationException();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
