diff options
Diffstat (limited to 'java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core')
4 files changed, 11 insertions, 44 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 9811667b17..4b1fd203fc 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 @@ -244,7 +244,7 @@ public class CompositeActivatorImpl implements CompositeActivator { if (targetService == null) { targetService = service; } - endpoint.setInterfaceContract(targetService.getInterfaceContract().makeUnidirectional(false)); + // endpoint.setInterfaceContract(targetService.getInterfaceContract().makeUnidirectional(false)); } } @@ -524,7 +524,7 @@ public class CompositeActivatorImpl implements CompositeActivator { reference.setInterfaceContract(sourceContract); } - endpointReference.setInterfaceContract(sourceContract.makeUnidirectional(false)); + // endpointReference.setInterfaceContract(sourceContract.makeUnidirectional(false)); } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java index 2a8ce544d0..6eb392f084 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java @@ -55,18 +55,6 @@ public class EndpointSerializerImpl implements EndpointSerializer { refProcessor = processors.getProcessor(EndpointReference.class); } - public void read(Endpoint endpoint, String xml) throws IOException { - try { - Endpoint result = readEndpoint(xml); - endpoint.setComponent(result.getComponent()); - endpoint.setService(result.getService()); - endpoint.setBinding(result.getBinding()); - endpoint.setInterfaceContract(result.getService().getInterfaceContract()); - } catch (Exception e) { - throw wrap(e); - } - - } public Endpoint readEndpoint(String xml) throws IOException { try { @@ -98,20 +86,6 @@ public class EndpointSerializerImpl implements EndpointSerializer { } } - public void read(EndpointReference endpointReference, String xml) throws IOException { - try { - EndpointReference result = readEndpointReference(xml); - endpointReference.setComponent(result.getComponent()); - endpointReference.setReference(result.getReference()); - endpointReference.setBinding(result.getBinding()); - endpointReference.setInterfaceContract(result.getReference().getInterfaceContract()); - endpointReference.setTargetEndpoint(result.getTargetEndpoint()); - endpointReference.setCallbackEndpoint(result.getCallbackEndpoint()); - } catch (Exception e) { - throw wrap(e); - } - } - public EndpointReference readEndpointReference(String xml) throws IOException { try { XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml)); 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 a9759d2e91..29262949df 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 @@ -232,7 +232,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint //InterfaceContract targetContract = getInterfaceContract(); // TODO - EPR - why is this looking at the component types. The endpoint should have the right interface contract by this time InterfaceContract targetContract = getServiceInterfaceContract(); - setInterfaceContract(targetContract); + // setInterfaceContract(targetContract); for (Operation operation : sourceContract.getInterface().getOperations()) { Operation targetOperation = interfaceContractMapper.map(targetContract.getInterface(), operation); if (targetOperation == null) { @@ -480,13 +480,6 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint @Override public void resolve() { - if (component == null && xml != null) { - try { - getSerializer().read(this, xml); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } super.resolve(); } @@ -496,12 +489,12 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint return bindingInterfaceContract; } bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract(); - if (bindingInterfaceContract == null && service != null) { - bindingInterfaceContract = service.getInterfaceContract(); - } if (bindingInterfaceContract == null) { bindingInterfaceContract = getInterfaceContract(); } + if (bindingInterfaceContract == null) { + bindingInterfaceContract = getServiceInterfaceContract(); + } return bindingInterfaceContract; } 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 efdbc71bbd..5b2de2f01f 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 @@ -276,8 +276,8 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen policyProvider.start(); } - InterfaceContract bindingContract = getBindingInterfaceContract(); - endpoint.setInterfaceContract(bindingContract); + // InterfaceContract bindingContract = getBindingInterfaceContract(); + // endpoint.setInterfaceContract(bindingContract); } @@ -441,12 +441,12 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen return bindingInterfaceContract; } bindingInterfaceContract = getBindingProvider().getBindingInterfaceContract(); - if (bindingInterfaceContract == null && reference != null) { - bindingInterfaceContract = reference.getInterfaceContract(); - } if (bindingInterfaceContract == null) { bindingInterfaceContract = getInterfaceContract(); } + if (bindingInterfaceContract == null) { + bindingInterfaceContract = getReferenceInterfaceContract(); + } return bindingInterfaceContract; } |