Rename getInterfaceContract() of Endpoint/EndpointReference

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

12 files changed, 14 insertions, 38 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 4b9f07ae7e..a055248357 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
@@ -104,7 +104,7 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti
             ComponentService service = (ComponentService)endpoint.getService().clone();
             component.getServices().add(service);
             service.getBindings().clear();
-            service.setInterfaceContract(endpoint.getInterfaceContract());
+            service.setInterfaceContract(endpoint.getComponentServiceInterfaceContract());
             Binding binding = (Binding)endpoint.getBinding().clone();
             service.getBindings().add(binding);
             return composite;
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index b682c2870e..2a26bcb66b 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
@@ -93,14 +93,7 @@ public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable {
      *
      * @return the interface contract
      */
-    InterfaceContract getInterfaceContract();
-
-    /**
-     * Sets the interface contract defining the interface
-     *
-     * @param interfaceContract the interface contract
-     */
-    void setInterfaceContract(InterfaceContract interfaceContract);
+    InterfaceContract getComponentServiceInterfaceContract();
 
     /**
      * Get the service's callback endpoint references that
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index a3e4ef133d..793a07d55a 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
@@ -121,14 +121,7 @@ public interface EndpointReference extends Base, PolicySubject, Cloneable, Seria
      *
      * @return the interface contract
      */
-    InterfaceContract getInterfaceContract();
-
-    /**
-     * Sets the interface contract defining the interface
-     *
-     * @param interfaceContract the interface contract
-     */
-    void setInterfaceContract(InterfaceContract interfaceContract);
+    InterfaceContract getComponentReferenceInterfaceContract();
 
     /**
      * Get the reference callback endpoint that
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 340020cb1b..d518230a92 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
@@ -100,7 +100,7 @@ public class EndpointImpl implements Endpoint {
         reset();
     }
 
-    public InterfaceContract getInterfaceContract() {
+    public InterfaceContract getComponentServiceInterfaceContract() {
         resolve();
         if (interfaceContract == null && service != null) {
             interfaceContract = service.getInterfaceContract();
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index 8b39a19b23..b39e27683d 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
@@ -123,7 +123,7 @@ public class EndpointReferenceImpl implements EndpointReference {
         reset();
     }
 
-    public InterfaceContract getInterfaceContract() {
+    public InterfaceContract getComponentReferenceInterfaceContract() {
         resolve();
         if (interfaceContract == null && reference != null) {
             interfaceContract = reference.getInterfaceContract();
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
index 2538756227..ca13532bcf 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
@@ -111,9 +111,6 @@ public class EndpointBuilderImpl implements CompositeBuilder {
                             Endpoint endpoint = assemblyFactory.createEndpoint();
                             endpoint.setComponent(component);
                             endpoint.setService(service);
-                            if (service != null) {
-                                endpoint.setInterfaceContract(service.getInterfaceContract());
-                            }
                             endpoint.setBinding(binding);
                             endpoint.setUnresolved(false);
                             service.getEndpoints().add(endpoint);
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
index 445118b9f1..be55be3bbe 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
@@ -903,9 +903,6 @@ public class EndpointReferenceBuilderImpl {
         EndpointReference endpointRef = assemblyFactory.createEndpointReference();
         endpointRef.setComponent(component);
         endpointRef.setReference(reference);
-        if (reference != null) {
-            endpointRef.setInterfaceContract(reference.getInterfaceContract());
-        }
         endpointRef.setUnresolved(unresolved);
         return endpointRef;
     } // end method createEndpointRef
@@ -921,9 +918,6 @@ public class EndpointReferenceBuilderImpl {
         Endpoint endpoint = createEndpoint(unresolved);
         endpoint.setComponent(component);
         endpoint.setService(service);
-        if (service != null) {
-            endpoint.setInterfaceContract(service.getInterfaceContract());
-        }
         endpoint.setUnresolved(unresolved);
         return endpoint;
     } // end method createEndpoint
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index a44e4a93b7..3dafaedf35 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
@@ -521,7 +521,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
         }
         bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract();
         if (bindingInterfaceContract == null) {
-            bindingInterfaceContract = getInterfaceContract();
+            bindingInterfaceContract = getComponentServiceInterfaceContract();
         }
         if (bindingInterfaceContract == null) {
             bindingInterfaceContract = getComponentTypeServiceInterfaceContract();
@@ -535,11 +535,11 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint
             return serviceInterfaceContract;
         }
         if (service == null) {
-            return getInterfaceContract();
+            return getComponentServiceInterfaceContract();
         }
         serviceInterfaceContract = getLeafContract(service).getInterfaceContract();
         if (serviceInterfaceContract == null) {
-            serviceInterfaceContract = getInterfaceContract();
+            serviceInterfaceContract = getComponentServiceInterfaceContract();
         }
         return serviceInterfaceContract;
     }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index fe343e941d..fa61ff8721 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
@@ -465,7 +465,7 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
         }
         bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract();
         if (bindingInterfaceContract == null) {
-            bindingInterfaceContract = getInterfaceContract();
+            bindingInterfaceContract = getComponentReferenceInterfaceContract();
         }
         if (bindingInterfaceContract == null) {
             bindingInterfaceContract = getComponentTypeReferenceInterfaceContract();
@@ -479,11 +479,11 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen
             return referenceInterfaceContract;
         }
         if (reference == null) {
-            return getInterfaceContract();
+            return getComponentReferenceInterfaceContract();
         }
         referenceInterfaceContract = getLeafContract(reference).getInterfaceContract();
         if (referenceInterfaceContract == null) {
-            referenceInterfaceContract = getInterfaceContract();
+            referenceInterfaceContract = getComponentReferenceInterfaceContract();
         }
         return referenceInterfaceContract;
     }
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index 115a4d31dd..1b6cf79645 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
@@ -305,7 +305,7 @@ public class ComponentContextImpl implements RuntimeComponentContext {
                                                        RuntimeEndpoint endpoint) {
         try {
             if (businessInterface == null) {
-                InterfaceContract contract = endpoint.getInterfaceContract();
+                InterfaceContract contract = endpoint.getComponentTypeServiceInterfaceContract();
                 businessInterface = (Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
             }
             RuntimeEndpointReference ref =
@@ -369,7 +369,6 @@ public class ComponentContextImpl implements RuntimeComponentContext {
         endpointReference.setReference(componentReference);
         endpointReference.setBinding(endpoint.getBinding());
         endpointReference.setUnresolved(false);
-        endpointReference.setInterfaceContract(interfaceContract);
         endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING);
 
         endpointReference.setTargetEndpoint(endpoint);
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
index d50d1ef9f9..6d29a0c51a 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
@@ -45,7 +45,7 @@ public class EndpointHelper {
     }
 
     private static List<String> getInterfaces(Endpoint endpoint) {
-        Interface intf = endpoint.getInterfaceContract().getInterface();
+        Interface intf = endpoint.getComponentServiceInterfaceContract().getInterface();
         JavaInterface javaInterface = (JavaInterface)intf;
         return Collections.singletonList(javaInterface.getName());
     }
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
index a649dac357..9247978b23 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
@@ -357,7 +357,7 @@ public class EndpointIntrospector {
         Endpoint ep = (Endpoint)endpoint.getProperties().get(Endpoint.class.getName());
         if (ep != null) {
             bindings = Collections.singletonList(ep.getBinding());
-            interfaces = Collections.singletonList(((JavaInterface)ep.getInterfaceContract().getInterface()).getName());
+            interfaces = Collections.singletonList(((JavaInterface)ep.getComponentServiceInterfaceContract().getInterface()).getName());
             intents = ep.getRequiredIntents();
         } else {
             Map<String, Object> properties = endpoint.getProperties();