archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename getInterfaceContract() of Endpoint/EndpointReference

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
rfeng 2009-11-19 19:37:14 +00:00
commit 2d79e8c24e
12 changed files with 14 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
View file

@ -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;

9
java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
View file

@ -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

9
java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
View file

@ -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

2
java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
View file

@ -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();

2
java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
View file

@ -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();

3
java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
View file

@ -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);

6
java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
View file

@ -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

6
java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
View file

@ -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;
}

6
java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
View file

@ -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;
}

3
java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
View file

@ -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);

2
java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
View file

@ -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());
}

2
java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
View file

@ -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();