TUSCANY-3101 pass EndpointReference and Endpoint in to binding providers rather than component/reference or service/binding

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

2 files changed, 13 insertions, 25 deletions

diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0e94a28d98 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
@@ -20,9 +20,8 @@
 package org.apache.tuscany.sca.provider;
 
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 
 /**
  * A factory for creating the runtime artifacts that represent bindings.
@@ -32,29 +31,20 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 public interface BindingProviderFactory<M extends Binding> extends ProviderFactory<M> {
 
     /**
-     * Creates a new reference binding provider for the given component and
-     * reference.
+     * Creates a new reference binding provider for the given endpoint reference
      * 
-     * @param component The runtime component
-     * @param reference The reference on the runtime component
-     * @param binding The binding assembly model object
+     * @param endpointReference defines the component/reference/binding against which to create the provider
      * @return The binding provider
      */
-    ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                            RuntimeComponentReference reference,
-                                                            M binding);
+    ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference);
 
     /**
      * Creates a new service binding provider for the given component and
      * service.
      * 
-     * @param component The runtime component
-     * @param service The service on the runtime component
-     * @param binding The binding assembly model object
+     * @param endpoint defines the component/service/binding against which to create the provider
      * @return The binding provider
      */
-    ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                        RuntimeComponentService service,
-                                                        M binding);
+    ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint);
 
 }
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 84e000ab10..dabebb5400 100644
--- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
@@ -235,17 +237,13 @@ public class DefaultProviderFactoryExtensionPoint implements ProviderFactoryExte
         }
 
         @SuppressWarnings("unchecked")
-        public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                       RuntimeComponentReference reference,
-                                                                       Binding binding) {
-            return getFactory().createReferenceBindingProvider(component, reference, binding);
+        public ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference) {
+            return getFactory().createReferenceBindingProvider(endpointReference);
         }
 
         @SuppressWarnings("unchecked")
-        public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentService service,
-                                                                   Binding binding) {
-            return getFactory().createServiceBindingProvider(component, service, binding);
+        public ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint) {
+            return getFactory().createServiceBindingProvider(endpoint);
         }
 
         public Class<?> getModelType() {