Minor cleanup of the Endpoint2

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

4 files changed, 2 insertions, 63 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
index 254432434c..a7dd5dba91 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
@@ -105,27 +105,5 @@ public interface Endpoint2 extends Base, PolicySubject, Cloneable {
      * @return callbackEndpoint the reference callback endpoint
      */
     List<EndpointReference2> getCallbackEndpointReferences();
-    
-    /**
-     * Set the reference callback endpoint refefences
-     * 
-     * @param callbackEndpoint the reference callback endpoint
-     */
-    void setCallbackEndpointReferences(List<EndpointReference2> callbackEndpointReferences);   
-    
-    // not sure these are required
-  
-    /**
-     * Returns the binding specific URI for this endpoint.
-     * 
-     * @return uri the binding specific URI
-     */
-   // String getURI();
 
-    /**
-     * Sets the binding specific URI for this endpoint.
-     * 
-     * @param uri the binding specific URI
-     */
-   // void setURI(String uri);
 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
index 99f6e08e82..13c20cd8da 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
@@ -81,20 +81,6 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable {
     void setBinding(Binding binding);
     
     /**
-     * Get the reference callback binding 
-     * 
-     * @return callbackBinding the reference callback binding
-     */
-//    Binding getCallbackBinding();
-    
-    /**
-     * Set the reference callback binding 
-     * 
-     * @param callbackBinding the reference callback binding
-     */
-//    void setCallbackBinding(Binding callbackBinding);
-
-    /**
      * Get the name of the target service that this endpoint reference refers to
      * 
      * @return target service name
@@ -151,25 +137,4 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable {
      * @param callbackEndpoint the reference callback endpoint
      */
     void setCallbackEndpoint(Endpoint2 callbackEndpoint);
-    
-    
-    
-    
-    // not sure the methods below are required
-    
-
-    
-    /**
-     * Returns the binding specific target URI for this endpoint reference.
-     * 
-     * @return uri the binding specific target URI
-     */
-    //String getURI();
-
-    /**
-     * Sets the binding specific target URI for this endpoint reference.
-     * 
-     * @param uri the binding specific target URI
-     */
-    //void setURI(String uri);    
 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
index 1205bfeef4..b4d2c0d9ea 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
@@ -24,17 +24,13 @@ import java.util.List;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
 import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
 import org.apache.tuscany.sca.assembly.EndpointReference2;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
@@ -142,7 +138,7 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder {
                     endpoint.setComponent(endpointComponent);
                     endpoint.setService(endpointService);
                     endpoint.setBinding(binding);
-                    endpoint.setCallbackEndpointReferences(callbackEndpointReferences);
+                    endpoint.getCallbackEndpointReferences().addAll(callbackEndpointReferences);
                     endpoint.setUnresolved(false);
                     service.getEndpoints().add(endpoint);
                 }
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
index d1fc0123eb..79434bd041 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
@@ -44,7 +44,7 @@ public class Endpoint2Impl implements Endpoint2 {
     private ComponentService service;
     private Binding binding;
     private InterfaceContract interfaceContract;
-    private List<EndpointReference2> callbackEndpointReferences;
+    private List<EndpointReference2> callbackEndpointReferences = new ArrayList<EndpointReference2>();
     //private String uri;
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
     private List<Intent> requiredIntents = new ArrayList<Intent>();