TUSCANY-3894. Factor out introspection for same vs. different databindings on operation from DBRuntimeWireProcessor to new OperationDataBindingHelper util. Use this in DefaultLocalSCAReferenceBindingProvider to do a Mediator.copyXXX for same-databinding operations, while doing a Mediator.mediateXXX with a WSDL operation for different-databinding operations.

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

6 files changed, 52 insertions, 16 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/DefaultLocalSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/DefaultLocalSCAReferenceBindingProvider.java
index 49aa6eb33f..270345fb5f 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/DefaultLocalSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/DefaultLocalSCAReferenceBindingProvider.java
@@ -23,10 +23,12 @@ import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.assembly.Reference;

 import org.apache.tuscany.sca.binding.local.LocalSCABindingInvoker;

 import org.apache.tuscany.sca.binding.sca.transform.BindingSCATransformer;

-import org.apache.tuscany.sca.binding.sca.transform.DefaultBindingSCATransformer;

+import org.apache.tuscany.sca.binding.sca.transform.SameDBCopyTransformer;

+import org.apache.tuscany.sca.binding.sca.transform.WSDLMediateTransformer;

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.core.UtilityExtensionPoint;

 import org.apache.tuscany.sca.databinding.Mediator;

+import org.apache.tuscany.sca.databinding.util.OperationDataBindingHelper;

 import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;

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

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

@@ -44,6 +46,10 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
 import org.oasisopen.sca.ServiceRuntimeException;

 import org.oasisopen.sca.ServiceUnavailableException;

 

+/**

+*

+* @version $Rev$ $Date$

+*/

 public class DefaultLocalSCAReferenceBindingProvider implements EndpointReferenceAsyncProvider {

     private RuntimeEndpointReference endpointReference;

 

@@ -143,7 +149,7 @@ public class DefaultLocalSCAReferenceBindingProvider implements EndpointReferenc
                     } else {

                         throw new IllegalStateException();

                     }

-                    bindingTransformer = getBindingTransformer(operation, chain);

+                    bindingTransformer = getBindingTransformer(operation, targetOp);

                 }

                                                 

                 // it turns out that the chain source and target operations are

@@ -164,8 +170,20 @@ public class DefaultLocalSCAReferenceBindingProvider implements EndpointReferenc
         return result;

     }

     

-    protected BindingSCATransformer getBindingTransformer(Operation operation, InvocationChain chain) {

-        return new DefaultBindingSCATransformer(mediator, operation, chain);

+    protected BindingSCATransformer getBindingTransformer(Operation sourceOperation, Operation targetOperation) {   

+    	boolean differentDataBindings = OperationDataBindingHelper.isTransformationRequired(sourceOperation, targetOperation);

+

+    	if (differentDataBindings) { 

+    		InterfaceContract bindingInterfaceContract = getWSDLBindingInterfaceContract();   

+    		if (!bindingInterfaceContract.getInterface().isRemotable()) {

+    			throw new IllegalStateException("This method should only have been called for a remotable interface.");

+    		}

+    		Operation wsdlBindingOperation = interfaceContractMapper.map(bindingInterfaceContract.getInterface(), sourceOperation);                        

+    		return new WSDLMediateTransformer(mediator, sourceOperation, wsdlBindingOperation, targetOperation);                

+    	} else {

+    		return new SameDBCopyTransformer(mediator,  sourceOperation, targetOperation);

+    	}

+

     }

 

     @Override

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCABindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCABindingProviderFactory.java
index f9c1b05ab6..c0ed4e5559 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCABindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCABindingProviderFactory.java
@@ -28,6 +28,10 @@ import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;

 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;

 

+/**

+*

+* @version $Rev$ $Date$

+*/

 public class XMLWFLocalSCABindingProviderFactory implements BindingProviderFactory<LocalSCABinding> {

     private ExtensionPointRegistry extensionPoints;

     private SCABindingMapper scaBindingMapper;

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCAReferenceBindingProvider.java
index 170908c82d..67783c1795 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/XMLWFLocalSCAReferenceBindingProvider.java
@@ -20,15 +20,17 @@
 package org.apache.tuscany.sca.binding.local;

 

 import org.apache.tuscany.sca.binding.sca.transform.BindingSCATransformer;

-import org.apache.tuscany.sca.binding.sca.transform.DefaultBindingSCATransformer;

-import org.apache.tuscany.sca.binding.sca.transform.XMLWFBindingSCATransformer;

+import org.apache.tuscany.sca.binding.sca.transform.WSDLMediateTransformer;

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

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

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

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

 import org.apache.tuscany.sca.provider.SCABindingMapper;

 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;

 

+/**

+*

+* @version $Rev$ $Date$

+*/

 public class XMLWFLocalSCAReferenceBindingProvider extends DefaultLocalSCAReferenceBindingProvider {

 

     public XMLWFLocalSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,

@@ -37,12 +39,12 @@ public class XMLWFLocalSCAReferenceBindingProvider extends DefaultLocalSCARefere
         super(extensionPoints, endpointReference, mapper);

     }

     

-    protected BindingSCATransformer getBindingTransformer(Operation operation, InvocationChain chain) { 

+    protected BindingSCATransformer getBindingTransformer(Operation sourceOperation, Operation targetOperation) { 

         InterfaceContract bindingInterfaceContract = getWSDLBindingInterfaceContract();   

         if (!bindingInterfaceContract.getInterface().isRemotable()) {

             throw new IllegalStateException("This method should only have been called for a remotable interface.");

         }

-        Operation wsdlBindingOperation = interfaceContractMapper.map(bindingInterfaceContract.getInterface(), operation);                        

-        return new XMLWFBindingSCATransformer(mediator, operation, wsdlBindingOperation, chain);                

+        Operation wsdlBindingOperation = interfaceContractMapper.map(bindingInterfaceContract.getInterface(), sourceOperation);                        

+        return new WSDLMediateTransformer(mediator, sourceOperation, wsdlBindingOperation, targetOperation);                

     }

 }

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/BindingSCATransformer.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/BindingSCATransformer.java
index e84668fb1d..4a7b1d1cb8 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/BindingSCATransformer.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/BindingSCATransformer.java
@@ -19,6 +19,10 @@
 

 package org.apache.tuscany.sca.binding.sca.transform;

 

+/**

+*

+* @version $Rev$ $Date$

+*/

 public interface BindingSCATransformer {

     Object transformInput(Object body);

     Object transformOutput(Object body);

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/DefaultBindingSCATransformer.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/SameDBCopyTransformer.java
index 77e93f8672..c4fc9b94a2 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/DefaultBindingSCATransformer.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/SameDBCopyTransformer.java
@@ -23,16 +23,20 @@ import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.interfacedef.Operation;

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

 

-public class DefaultBindingSCATransformer implements BindingSCATransformer {

+/**

+*

+* @version $Rev$ $Date$

+*/

+public class SameDBCopyTransformer implements BindingSCATransformer {

 

     private Mediator mediator;

     private Operation sourceOperation;

     private Operation targetOperation;

     

-    public DefaultBindingSCATransformer(Mediator mediator, Operation sourceOperation, InvocationChain chain) {

+    public SameDBCopyTransformer(Mediator mediator, Operation sourceOperation, Operation targetOperation) {

         this.mediator = mediator;

         this.sourceOperation = sourceOperation;

-        this.targetOperation = chain.getTargetOperation();

+        this.targetOperation = targetOperation;

     }

     

     @Override

diff --git a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/XMLWFBindingSCATransformer.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/WSDLMediateTransformer.java
index cc366c1f7a..7e36442d4e 100644
--- a/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/XMLWFBindingSCATransformer.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/transform/WSDLMediateTransformer.java
@@ -26,18 +26,22 @@ import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.interfacedef.Operation;

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

 

-public class XMLWFBindingSCATransformer implements BindingSCATransformer {

+/**

+*

+* @version $Rev$ $Date$

+*/

+public class WSDLMediateTransformer implements BindingSCATransformer {

 

     private Mediator mediator;

     private Operation sourceOperation;

     private Operation wsdlBindingOperation;

     private Operation targetOperation;

     

-    public XMLWFBindingSCATransformer(Mediator mediator, Operation sourceOperation, Operation wsdlBindingOperation, InvocationChain chain) {

+    public WSDLMediateTransformer(Mediator mediator, Operation sourceOperation, Operation wsdlBindingOperation, Operation targetOperation) {

         this.mediator = mediator;

         this.sourceOperation = sourceOperation;

         this.wsdlBindingOperation = wsdlBindingOperation;

-        this.targetOperation = chain.getTargetOperation();

+        this.targetOperation = targetOperation;

     }

     

     @Override