Remove some now unneeded uses of DataExchangeSemantics

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923761 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 11 insertions, 67 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index c7552f932e..5fd380dab6 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
@@ -40,7 +40,6 @@ import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.oasisopen.sca.ServiceRuntimeException;
@@ -50,7 +49,7 @@ import org.oasisopen.sca.ServiceRuntimeException;
  * 
  * @version $Rev$ $Date$
  */
-class AtomBindingInvoker implements Invoker, DataExchangeSemantics {
+class AtomBindingInvoker implements Invoker {
     
     private static final Factory abderaFactory = Abdera.getNewFactory();
     private static final Parser abderaParser = Abdera.getNewParser();
@@ -508,8 +507,4 @@ class AtomBindingInvoker implements Invoker, DataExchangeSemantics {
         }
     }
 
-    public boolean allowsPassByReference() {
-        return true;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 9247c1d3db..999a3fcfd4 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
@@ -24,14 +24,13 @@ import org.apache.tuscany.sca.binding.ejb.util.NamingEndpoint;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 
 /**
  * EJBTargetInvoker
  *
  * @version $Rev$ $Date$
  */
-public class EJBBindingInvoker implements Invoker, DataExchangeSemantics {
+public class EJBBindingInvoker implements Invoker {
 
     private Operation operation;
     private String location;
@@ -84,9 +83,4 @@ public class EJBBindingInvoker implements Invoker, DataExchangeSemantics {
         return new NamingEndpoint(location);
     }
     
-    public boolean allowsPassByReference() {
-        // EJB RMI/IIOP always pass by value
-        return true;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
index 8615c128c1..0f4f88dcd8 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
@@ -31,7 +31,6 @@ import org.apache.tuscany.sca.binding.jms.JMSBindingException;
 import org.apache.tuscany.sca.binding.jms.context.JMSBindingContext;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
 import org.oasisopen.sca.ServiceRuntimeException;
@@ -41,7 +40,7 @@ import org.oasisopen.sca.ServiceRuntimeException;
  * 
  * @version $Rev$ $Date$
  */
-public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics {
+public class RRBJMSBindingInvoker implements Invoker {
 
     protected Operation operation;
     protected String operationName;
@@ -259,9 +258,4 @@ public class RRBJMSBindingInvoker implements Invoker, DataExchangeSemantics {
         return replyToDest;
     }  
     
-    public boolean allowsPassByReference() {
-        // JMS always pass by value
-        return true;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
index 851f4b53c9..a5d0c3a8da 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
@@ -34,7 +34,6 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;

 import org.apache.tuscany.sca.assembly.EndpointReference;

 import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;

 import org.apache.tuscany.sca.invocation.Invoker;

 import org.apache.tuscany.sca.invocation.Message;

 import org.codehaus.jackson.JsonGenerationException;

@@ -42,7 +41,7 @@ import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;

 import org.codehaus.jackson.map.ObjectMapper;

 

-public class JSONPInvoker implements Invoker, DataExchangeSemantics {

+public class JSONPInvoker implements Invoker {

     

     protected Operation operation;

     protected EndpointReference endpoint;

@@ -159,7 +158,4 @@ public class JSONPInvoker implements Invoker, DataExchangeSemantics {
         return args;

     }

     

-    public boolean allowsPassByReference() {

-        return true;

-    }

 }

diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index f3abf82520..b5ea6b1727 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
@@ -28,7 +28,6 @@ import org.apache.http.util.EntityUtils;
 import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
 import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.json.JSONArray;
@@ -39,7 +38,7 @@ import org.json.JSONObject;
  * 
  * @version $Rev$ $Date$
  */
-public class JSONRPCBindingInvoker implements Invoker, DataExchangeSemantics {
+public class JSONRPCBindingInvoker implements Invoker {
     private EndpointReference endpointReference;
     private Operation operation;
     private String uri;
@@ -141,7 +140,4 @@ public class JSONRPCBindingInvoker implements Invoker, DataExchangeSemantics {
         return jsonRequest;
     }
     
-    public boolean allowsPassByReference() {
-        return true;
-    }    
 }
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
index d25861b610..2b0859c416 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
@@ -26,7 +26,6 @@ import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.jabsorb.client.Client;
@@ -38,7 +37,7 @@ import org.jabsorb.client.TransportRegistry;
  * 
  * @version $Rev$ $Date$
  */
-public class JSONRPCClientInvoker implements Invoker, DataExchangeSemantics {
+public class JSONRPCClientInvoker implements Invoker {
     private EndpointReference endpointReference;
     private Operation operation;
     private Method method;
@@ -68,7 +67,4 @@ public class JSONRPCClientInvoker implements Invoker, DataExchangeSemantics {
         return msg;
     }
     
-    public boolean allowsPassByReference() {
-        return true;
-    }
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
index a90362de84..c10e05a768 100644
--- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
@@ -34,7 +34,7 @@ import org.apache.tuscany.sca.invocation.Message;
  *
  * @version $Rev$ $Date$
  */
-public class RMIBindingInvoker implements Invoker, DataExchangeSemantics {
+public class RMIBindingInvoker implements Invoker {
 
     private RMIHost rmiHost;
     private String uri;
@@ -98,9 +98,4 @@ public class RMIBindingInvoker implements Invoker, DataExchangeSemantics {
         }
     }
 
-    public boolean allowsPassByReference() {
-        // RMI always pass by value
-        return true;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index a4a5f8c655..a0b976c7ad 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
@@ -21,7 +21,6 @@ package org.apache.tuscany.sca.binding.sca.provider;
 
 import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.InvocationChain;
 import org.apache.tuscany.sca.invocation.Invoker;
@@ -31,7 +30,7 @@ import org.apache.tuscany.sca.invocation.Phase;
 /**
  * @version $Rev$ $Date$
  */
-public class SCABindingInvoker implements Interceptor, DataExchangeSemantics {
+public class SCABindingInvoker implements Interceptor {
     private InvocationChain chain;
     private Mediator mediator;
     private Operation sourceOperation;
@@ -89,11 +88,4 @@ public class SCABindingInvoker implements Interceptor, DataExchangeSemantics {
         return resultMsg;
     }
 
-    /**
-     * @see org.apache.tuscany.sca.invocation.DataExchangeSemantics#allowsPassByReference()
-     */
-    public boolean allowsPassByReference() {
-        return false;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
index 0117d2b2e7..4d7d7a6006 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
@@ -40,7 +40,6 @@ import org.apache.axis2.context.MessageContext;
 import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
@@ -52,7 +51,7 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
  *
  * @version $Rev$ $Date$
  */
-public class Axis2ReferenceBindingInvoker implements Invoker, DataExchangeSemantics {
+public class Axis2ReferenceBindingInvoker implements Invoker {
     public static final QName QNAME_WSA_FROM =
         new QName(AddressingConstants.Final.WSA_NAMESPACE, 
                   AddressingConstants.WSA_FROM,
@@ -166,7 +165,4 @@ public class Axis2ReferenceBindingInvoker implements Invoker, DataExchangeSemant
         return operationClient;
     }
     
-    public boolean allowsPassByReference() {
-        return true;
-    }
 }
diff --git a/sca-java-2.x/trunk/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/trunk/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 17efe33321..de29088c1d 100644
--- a/sca-java-2.x/trunk/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/trunk/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
@@ -35,7 +34,7 @@ import org.apache.tuscany.sca.runtime.Invocable;
  * 
  * @version $Rev$ $Date$
  */
-public class DataTransformationInterceptor implements Interceptor, DataExchangeSemantics {
+public class DataTransformationInterceptor implements Interceptor {
     private Invoker next;
 
     private Operation sourceOperation;
@@ -96,8 +95,4 @@ public class DataTransformationInterceptor implements Interceptor, DataExchangeS
         this.next = next;
     }
 
-    public boolean allowsPassByReference() {
-        return true;
-    }
-
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index de6d33fe87..26e1e56845 100644
--- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
@@ -29,7 +29,6 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.interfacedef.DataType;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -41,7 +40,7 @@ import org.oasisopen.sca.ServiceRuntimeException;
  * 
  * @version $Rev$ $Date$
  */
-public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics {
+public class JavaImplementationInvoker implements Invoker {
     protected Operation operation;
     protected Method method;
     protected boolean allowsPBR;
@@ -147,8 +146,4 @@ public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics
         return msg;
     }
 
-    public boolean allowsPassByReference() {
-        return allowsPBR;
-    }
-
 }