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, 7 insertions, 7 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 27fad24b1f..cff7dbd21a 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -298,7 +298,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
         }
 
         for (Endpoint endpoint : service.getEndpoints()) {
-            addServiceBindingProvider(component, service, endpoint.getBinding());
+            addServiceBindingProvider(endpoint, component, service, endpoint.getBinding());
         }
         addServiceWires(component, service);
     }
@@ -314,6 +314,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
     }
 
     private ServiceBindingProvider addServiceBindingProvider(
+            Endpoint endpoint, 
             RuntimeComponent component, RuntimeComponentService service,
             Binding binding) {
         BindingProviderFactory providerFactory = (BindingProviderFactory) providerFactories
@@ -321,8 +322,7 @@ public class CompositeActivatorImpl implements CompositeActivator {
         if (providerFactory != null) {
             @SuppressWarnings("unchecked")
             ServiceBindingProvider bindingProvider = providerFactory
-                    .createServiceBindingProvider((RuntimeComponent) component,
-                            (RuntimeComponentService) service, binding);
+                    .createServiceBindingProvider(endpoint);
             if (bindingProvider != null) {
                 ((RuntimeComponentService) service).setBindingProvider(binding,
                         bindingProvider);
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
index ada355d32e..e8554ec301 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
@@ -316,7 +316,8 @@ public class RuntimeWireImpl implements RuntimeWire {
         RuntimeComponentReference runtimeRef = (RuntimeComponentReference)endpointReference.getReference();
 
         if (runtimeRef.getBindingProvider(endpointReference.getBinding()) == null) {
-            addReferenceBindingProvider((RuntimeComponent)endpointReference.getComponent(),
+            addReferenceBindingProvider(endpointReference,
+                    (RuntimeComponent)endpointReference.getComponent(),
                     runtimeRef,
                     endpointReference.getBinding());
         }
@@ -340,6 +341,7 @@ public class RuntimeWireImpl implements RuntimeWire {
     }
 
     private ReferenceBindingProvider addReferenceBindingProvider(
+            EndpointReference endpointReference, 
             RuntimeComponent component, RuntimeComponentReference reference,
             Binding binding) {
         BindingProviderFactory providerFactory = (BindingProviderFactory) providerFactories
@@ -347,9 +349,7 @@ public class RuntimeWireImpl implements RuntimeWire {
         if (providerFactory != null) {
             @SuppressWarnings("unchecked")
             ReferenceBindingProvider bindingProvider = providerFactory
-                    .createReferenceBindingProvider(
-                            (RuntimeComponent) component,
-                            (RuntimeComponentReference) reference, binding);
+                    .createReferenceBindingProvider(endpointReference);
             if (bindingProvider != null) {
                 ((RuntimeComponentReference) reference).setBindingProvider(
                         binding, bindingProvider);