diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-11 16:55:44 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-11 16:55:44 +0000 |
commit | 17d2f439c3be0f7288c72846a60d42a120dce9ce (patch) | |
tree | dc5ce7563cdaf63c43c1ad45a526cf93cee0bab3 /java/sca/modules/assembly/src | |
parent | 5affea192673c86fa818e69705e132b4af364c0b (diff) |
TUSCANY-3091 rename Endpoint2 and EndpointReference2 to remove the 2 subscript now they are in use full time
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@783845 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/assembly/src')
15 files changed, 95 insertions, 96 deletions
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java index cfba7bdc8d..3c850dc053 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java @@ -158,12 +158,12 @@ public interface AssemblyFactory { * * @return a new endpoint */ - Endpoint2 createEndpoint(); + Endpoint createEndpoint(); /** * Create a new endpoint reference * * @return a new endpoint reference */ - EndpointReference2 createEndpointReference(); + EndpointReference createEndpointReference(); } 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/Endpoint.java index f400cf0d01..759fa0900e 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/Endpoint.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @version $Rev$ $Date$ */ -public interface Endpoint2 extends Base, PolicySubject, Cloneable, Serializable { +public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable { /** * Get the structural URI of the service binding * @return structural URI of the service/binding @@ -158,6 +158,6 @@ public interface Endpoint2 extends Base, PolicySubject, Cloneable, Serializable * * @return callbackEndpoint the reference callback endpoint */ - List<EndpointReference2> getCallbackEndpointReferences(); + List<EndpointReference> getCallbackEndpointReferences(); } 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/EndpointReference.java index b6ca379996..446aa2dbac 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/EndpointReference.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @version $Rev$ $Date$ */ -public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Serializable { +public interface EndpointReference extends Base, PolicySubject, Cloneable, Serializable { /** * Get the structural URI of the reference binding * @return The structural URI of the reference/binding @@ -100,14 +100,14 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Seri * * @return endpoint the target endpoint */ - Endpoint2 getTargetEndpoint(); + Endpoint getTargetEndpoint(); /** * Set the target endpoint model object * * @param endpoint the target endpoint */ - void setTargetEndpoint(Endpoint2 targetEndpoint); + void setTargetEndpoint(Endpoint targetEndpoint); /** * Returns the interface contract defining the interface @@ -130,12 +130,12 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Seri * * @return callbackEndpoint the reference callback endpoint */ - Endpoint2 getCallbackEndpoint(); + Endpoint getCallbackEndpoint(); /** * Set the reference callback endpoint * * @param callbackEndpoint the reference callback endpoint */ - void setCallbackEndpoint(Endpoint2 callbackEndpoint); + void setCallbackEndpoint(Endpoint callbackEndpoint); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java index 34b2607b30..08344ca24f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java @@ -82,6 +82,6 @@ public interface Reference extends AbstractReference, Contract { * * @return the endpoint references implied by this reference */ - List<EndpointReference2> getEndpointReferences(); + List<EndpointReference> getEndpointReferences(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java index 88ef8c5d6e..e597a50f30 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java @@ -37,5 +37,5 @@ public interface Service extends AbstractService, Contract { * * @return the endpoints implied by this service */ - List<Endpoint2> getEndpoints(); + List<Endpoint> getEndpoints(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java index 1f62606a83..220d82eab9 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.assembly.builder; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.monitor.Monitor; /** @@ -38,6 +38,6 @@ public interface EndpointReferenceBuilder { * @param endpointReference * @param monitor */ - void build(EndpointReference2 endpointReference, Monitor monitor); + void build(EndpointReference endpointReference, Monitor monitor); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java index 7fd49a9d0d..58a6629608 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java @@ -31,8 +31,8 @@ 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.Endpoint2; -import org.apache.tuscany.sca.assembly.EndpointReference2; +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.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.SCABinding; @@ -114,7 +114,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI if ((service.getInterfaceContract() != null) && (service.getInterfaceContract().getCallbackInterface() != null)){ if ( reference.getName().equals(service.getName())){ - for ( Endpoint2 endpoint : service.getEndpoints()){ + for ( Endpoint endpoint : service.getEndpoints()){ endpoint.getCallbackEndpointReferences().addAll(reference.getEndpointReferences()); } break; @@ -150,7 +150,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI targetComponentService.getInterfaceContract())) { // create endpoint reference - with a dummy endpoint which will be replaced when policies // are matched and bindings are configured later - EndpointReference2 endpointRef = createEndpointRef( component, reference, false ); + EndpointReference endpointRef = createEndpointRef( component, reference, false ); endpointRef.setTargetEndpoint( createEndpoint(targetComponent, targetComponentService, true) ); reference.getEndpointReferences().add(endpointRef); @@ -196,7 +196,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // create endpoint reference - with dummy endpoint which will be replaced when policies // are matched and bindings are configured later - EndpointReference2 endpointRef = createEndpointRef( component, reference, false ); + EndpointReference endpointRef = createEndpointRef( component, reference, false ); endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true)); reference.getEndpointReferences().add(endpointRef); } else { @@ -208,7 +208,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } } else { // add an unresolved endpoint reference with an unresolved endpoint to go with it - EndpointReference2 endpointRef = createEndpointRef( component, reference, true ); + EndpointReference endpointRef = createEndpointRef( component, reference, true ); endpointRef.setTargetEndpoint(createEndpoint(component, targetName)); reference.getEndpointReferences().add(endpointRef); warning(monitor, "ComponentReferenceTargetNotFound", @@ -234,7 +234,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // create endpoint reference for manually configured bindings with a resolved endpoint to // signify that this reference is pointing at some unwired endpoint - EndpointReference2 endpointRef = createEndpointRef( component, reference, + EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false ); endpointRef.setTargetEndpoint(createEndpoint(false)); reference.getEndpointReferences().add(endpointRef); @@ -264,7 +264,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI targetComponentService.getInterfaceContract())) { // create endpoint reference with dummy endpoint which will be replaced when policies // are matched and bindings are configured later - EndpointReference2 endpointRef = createEndpointRef( component, reference, binding, null, false ); + EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false ); endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true)); reference.getEndpointReferences().add(endpointRef); } else { @@ -277,7 +277,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } else { // create endpoint reference for manually configured bindings with resolved endpoint // to signify that this reference is pointing at some unwired endpoint - EndpointReference2 endpointRef = createEndpointRef( component, reference, binding, null, false ); + EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false ); endpointRef.setTargetEndpoint(createEndpoint( false )); reference.getEndpointReferences().add(endpointRef); } // end if @@ -302,7 +302,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // Find all the leafmost component references related to this component reference EndpointrefInfo refInfo = gatherEndpointrefInfo( component, reference, null ); - List<Endpoint2> endpoints = getReferenceEndpoints( composite, component, + List<Endpoint> endpoints = getReferenceEndpoints( composite, component, reference, components, componentServices ); Multiplicity multiplicity = reference.getMultiplicity(); @@ -324,14 +324,14 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI ComponentReference leafReference = refInfo.getRefs().get(i); boolean unresolved = false; - for( Endpoint2 endpoint : endpoints ) { + for( Endpoint endpoint : endpoints ) { if( endpoint.isUnresolved() && endpoint.getComponent() == null && endpoint.getService() == null ) { unresolved = true; } else { unresolved = false; } // end if // Create an EndpointReference pointing at the endpoint - EndpointReference2 endRef = createEndpointRef( leafComponent, leafReference, + EndpointReference endRef = createEndpointRef( leafComponent, leafReference, endpoint.getBinding(), endpoint, unresolved); // Add the EndpointReference to the top level AND the leaf level reference, if not the same!! if( useNew ) { @@ -351,7 +351,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } // end method createReferenceEndpointReferences2 - private List<Endpoint2> getReferenceEndpoints(Composite composite, Component component, + private List<Endpoint> getReferenceEndpoints(Composite composite, Component component, ComponentReference reference, Map<String, Component> components, Map<String, ComponentService> componentServices ) { // Target services for a component reference are specified in one of a number of ways, in order: @@ -361,7 +361,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // are compatible with the reference // 1. takes precedence over 2. - 3. is only used if neither of the other applies - List<Endpoint2> endpoints = new ArrayList<Endpoint2>(); + List<Endpoint> endpoints = new ArrayList<Endpoint>(); // Get targets for references that are callbacks... if( getReferenceCallbackEndpoints( composite, component, reference, @@ -396,13 +396,13 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ private boolean getReferenceCallbackEndpoints( Composite composite, Component component, ComponentReference reference, Map<String, Component> components, - Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) { + Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) { // Only if this reference is a callback are there any endpoints of this kind if( reference.isCallback() ) { // add an unresolved endpoint reference with an unresolved endpoint to go with it // there will be one of these for each binding on the reference for( Binding binding : reference.getBindings() ) { - Endpoint2 endpoint = createEndpoint(true); + Endpoint endpoint = createEndpoint(true); endpoint.setBinding(binding); endpoints.add( endpoint ); } // end for @@ -425,7 +425,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ private boolean getReferenceTargetEndpoints( Composite composite, Component component, ComponentReference reference, Map<String, Component> components, - Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) { + Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) { List<ComponentService> refTargets = getReferenceTargets( reference ); if ( !refTargets.isEmpty() ) { @@ -442,11 +442,11 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // create endpoint reference - with dummy endpoint which will be replaced when policies // are matched and bindings are configured later // TODO - Endpoint2 endpoint = selectTargetEndpoint( reference, targetComponentService ); + Endpoint endpoint = selectTargetEndpoint( reference, targetComponentService ); System.out.println("Selected Endpoint: component=" + endpoint.getComponent().getName() + " service=" + endpoint.getService().getName() + " binding=" + endpoint.getBinding().toString()); - Endpoint2 endpoint2 = createEndpoint(targetComponent, targetComponentService, true); + Endpoint endpoint2 = createEndpoint(targetComponent, targetComponentService, true); endpoint2.setBinding( endpoint.getBinding() ); endpoints.add( endpoint2 ); } else { @@ -477,11 +477,11 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * This will in practice select a particular binding on the service if there is more than one endpoint on the * service. If there are no matches, this method returns null */ - private Endpoint2 selectTargetEndpoint( ComponentReference reference, ComponentService service ) { + private Endpoint selectTargetEndpoint( ComponentReference reference, ComponentService service ) { // Return the first endpoint with a Binding which is compatible with the policy requirements on // the reference - for( Endpoint2 endpoint : service.getEndpoints() ) { + for( Endpoint endpoint : service.getEndpoints() ) { return endpoint; } //end for @@ -500,7 +500,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ private boolean getReferenceBindingEndpoints( Composite composite, Component component, ComponentReference reference, Map<String, Component> components, - Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) { + Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) { // Get service endpoints declared by <binding/> subelements if( bindingsIdentifyTargets( reference ) ) { for (Binding binding : reference.getBindings()) { @@ -515,7 +515,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI if( !reference.isCallback() && (binding instanceof SCABinding) ) continue; // create an unwired endpoint containing the binding - Endpoint2 endpoint = createEndpoint( false ); + Endpoint endpoint = createEndpoint( false ); endpoint.setBinding( binding ); endpoints.add( endpoint ); continue; @@ -569,7 +569,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ private boolean getReferenceAutowireEndpoints( Composite composite, Component component, ComponentReference reference, Map<String, Component> components, - Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) { + Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) { // Get compatible target services if @autowire=true is specified if ( reference.getAutowire() == Boolean.TRUE ) { @@ -809,9 +809,9 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @param unresolved * @return the endpoint reference */ - private EndpointReference2 createEndpointRef( Component component, ComponentReference reference, - Binding binding, Endpoint2 endpoint, boolean unresolved ) { - EndpointReference2 endpointRef = createEndpointRef( component, reference, unresolved ); + private EndpointReference createEndpointRef( Component component, ComponentReference reference, + Binding binding, Endpoint endpoint, boolean unresolved ) { + EndpointReference endpointRef = createEndpointRef( component, reference, unresolved ); endpointRef.setBinding(binding); endpointRef.setTargetEndpoint(endpoint); return endpointRef; @@ -824,8 +824,8 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @param unresolved * @return the endpoint reference */ - private EndpointReference2 createEndpointRef( Component component, ComponentReference reference, boolean unresolved ) { - EndpointReference2 endpointRef = assemblyFactory.createEndpointReference(); + private EndpointReference createEndpointRef( Component component, ComponentReference reference, boolean unresolved ) { + EndpointReference endpointRef = assemblyFactory.createEndpointReference(); endpointRef.setComponent(component); endpointRef.setReference(reference); endpointRef.setUnresolved(unresolved); @@ -840,8 +840,8 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @param unresolved * @return the endpoint */ - private Endpoint2 createEndpoint( Component component, ComponentService service, boolean unresolved) { - Endpoint2 endpoint = createEndpoint( unresolved); + private Endpoint createEndpoint( Component component, ComponentService service, boolean unresolved) { + Endpoint endpoint = createEndpoint( unresolved); endpoint.setComponent(component); endpoint.setService(service); endpoint.setUnresolved(unresolved); @@ -853,8 +853,8 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @param unresolved * @return the endpoint */ - private Endpoint2 createEndpoint( boolean unresolved) { - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + private Endpoint createEndpoint( boolean unresolved) { + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setUnresolved(unresolved); return endpoint; } // end method createEndpoint @@ -871,7 +871,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * </ul> * @return the endpoint */ - private Endpoint2 createEndpoint(Component component, String targetName) { + private Endpoint createEndpoint(Component component, String targetName) { String[] parts = targetName.split("/"); if (parts.length < 1 || parts.length > 3) { throw new IllegalArgumentException("Invalid target URI: " + targetName); @@ -902,7 +902,7 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI uri = uri + "#service(" + parts[1] + ")"; } - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setUnresolved(true); endpoint.setURI(uri); return endpoint; 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 e5e97a7190..00674b1f27 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 @@ -28,8 +28,8 @@ import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.ComponentService; import org.apache.tuscany.sca.assembly.Composite; import org.apache.tuscany.sca.assembly.CompositeService; -import org.apache.tuscany.sca.assembly.Endpoint2; -import org.apache.tuscany.sca.assembly.EndpointReference2; +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.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; @@ -104,7 +104,7 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder { } // end if for (Binding binding : service.getBindings()){ - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setComponent(endpointComponent); endpoint.setService(endpointService); endpoint.setBinding(binding); @@ -127,7 +127,7 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder { // Create an endpoint for each binding which applies to this service // and copy across the information relating to the endpoint. for( Binding binding : theBindings ) { - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setComponent(theInfo.getComponent()); endpoint.setService(theInfo.getComponentService()); endpoint.setBinding(binding); diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java index d1785e7280..5c3249369b 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java @@ -31,8 +31,8 @@ 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.EndpointReference2; +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.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; @@ -277,7 +277,7 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo .getService().getInterfaceContract().getCallbackInterface()); } - for (Endpoint2 ep : componentService.getEndpoints()) { + for (Endpoint ep : componentService.getEndpoints()) { // Inherit from the componentType.service.interface if (componentService.getService() != null && componentService.getService().getInterfaceContract() != null) { inherit(ep, componentService.getService().getInterfaceContract().getInterface()); @@ -322,7 +322,7 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo componentReference.getReference().getInterfaceContract().getCallbackInterface()); } - for (EndpointReference2 epr : componentReference.getEndpointReferences()) { + for (EndpointReference epr : componentReference.getEndpointReferences()) { // Inherit from the componentType.reference.interface if (componentReference.getReference() != null && componentReference.getReference() .getInterfaceContract() != null) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java index 1c6049ad89..9f810a2c60 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.ComponentReference; import org.apache.tuscany.sca.assembly.CompositeReference; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.OptimizableBinding; import org.apache.tuscany.sca.assembly.Reference; @@ -179,8 +179,8 @@ abstract class ReferenceConfigurationUtil { } // end if } // end if // Clone the EndpointReferences from the outer level and add to the promoted reference - for( EndpointReference2 epRef : reference.getEndpointReferences()){ - EndpointReference2 epRefClone = copyHigherReference( epRef, promotedReference ); + for( EndpointReference epRef : reference.getEndpointReferences()){ + EndpointReference epRefClone = copyHigherReference( epRef, promotedReference ); promotedReference.getEndpointReferences().add(epRefClone); } // end for } // end if @@ -206,10 +206,10 @@ abstract class ReferenceConfigurationUtil { * @param promotedReference - the promoted reference * @return - a copy of the EndpointReference with data merged from the promoted reference */ - private static EndpointReference2 copyHigherReference( EndpointReference2 epRef, ComponentReference promotedReference ) { - EndpointReference2 epRefClone = null; + private static EndpointReference copyHigherReference( EndpointReference epRef, ComponentReference promotedReference ) { + EndpointReference epRefClone = null; try { - epRefClone = (EndpointReference2) epRef.clone(); + epRefClone = (EndpointReference) epRef.clone(); } catch (Exception e) { // Ignore (we know that EndpointReference2 can be cloned) } // end try diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java index 09b8ff453c..ab43fc5b5d 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java @@ -33,8 +33,8 @@ 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.ConstrainingType; -import org.apache.tuscany.sca.assembly.Endpoint2; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.assembly.Extension; import org.apache.tuscany.sca.assembly.Property; import org.apache.tuscany.sca.assembly.Reference; @@ -127,11 +127,11 @@ public abstract class AssemblyFactoryImpl implements AssemblyFactory { return new ExtensionImpl(); } - public Endpoint2 createEndpoint() { - return new Endpoint2Impl(registry); + public Endpoint createEndpoint() { + return new EndpointImpl(registry); } - public EndpointReference2 createEndpointReference() { - return new EndpointReference2Impl(registry); + public EndpointReference createEndpointReference() { + return new EndpointReferenceImpl(registry); } } 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/EndpointImpl.java index bc5f5899d6..9c00caf01c 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/EndpointImpl.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Endpoint2; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.policy.ExtensionType; @@ -38,7 +38,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @version $Rev$ $Date$ */ -public class Endpoint2Impl implements Endpoint2 { +public class EndpointImpl implements Endpoint { private static final long serialVersionUID = 7344399683703812593L; protected ExtensionPointRegistry registry; @@ -48,11 +48,11 @@ public class Endpoint2Impl implements Endpoint2 { protected ComponentService service; protected Binding binding; protected InterfaceContract interfaceContract; - protected List<EndpointReference2> callbackEndpointReferences = new ArrayList<EndpointReference2>(); + protected List<EndpointReference> callbackEndpointReferences = new ArrayList<EndpointReference>(); protected List<PolicySet> policySets = new ArrayList<PolicySet>(); protected List<Intent> requiredIntents = new ArrayList<Intent>(); - protected Endpoint2Impl(ExtensionPointRegistry registry) { + protected EndpointImpl(ExtensionPointRegistry registry) { this.registry = registry; } @@ -115,7 +115,7 @@ public class Endpoint2Impl implements Endpoint2 { * * @return callbackEndpoint the reference callback endpoint */ - public List<EndpointReference2> getCallbackEndpointReferences(){ + public List<EndpointReference> getCallbackEndpointReferences(){ resolve(); return callbackEndpointReferences; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java index c175689082..aa11088727 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java @@ -24,8 +24,8 @@ import java.util.List; 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.Endpoint2; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.policy.ExtensionType; @@ -38,9 +38,8 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @version $Rev$ $Date$ */ -public class EndpointReference2Impl implements EndpointReference2 { +public class EndpointReferenceImpl implements EndpointReference { protected ExtensionPointRegistry registry; - // this endpoint reference protected boolean unresolved = true; protected String uri; protected Component component; @@ -51,22 +50,22 @@ public class EndpointReference2Impl implements EndpointReference2 { protected InterfaceContract interfaceContract; // the target of the endpoint reference - protected Endpoint2 targetEndpoint; + protected Endpoint targetEndpoint; // callback endpoint that messages across this reference // will be directed toward - protected Endpoint2 callbackEndpoint; + protected Endpoint callbackEndpoint; - protected EndpointReference2Impl(ExtensionPointRegistry registry) { + protected EndpointReferenceImpl(ExtensionPointRegistry registry){ this.registry = registry; } @Override public Object clone() throws CloneNotSupportedException { - EndpointReference2 cloned = (EndpointReference2)super.clone(); + EndpointReference cloned = (EndpointReference)super.clone(); if (targetEndpoint != null){ - cloned.setTargetEndpoint((Endpoint2)targetEndpoint.clone()); + cloned.setTargetEndpoint((Endpoint)targetEndpoint.clone()); } return cloned; @@ -107,11 +106,11 @@ public class EndpointReference2Impl implements EndpointReference2 { this.uri = null; } - public Endpoint2 getTargetEndpoint() { + public Endpoint getTargetEndpoint() { return targetEndpoint; } - public void setTargetEndpoint(Endpoint2 targetEndpoint) { + public void setTargetEndpoint(Endpoint targetEndpoint) { this.targetEndpoint = targetEndpoint; } @@ -142,11 +141,11 @@ public class EndpointReference2Impl implements EndpointReference2 { throw new UnsupportedOperationException(); } - public Endpoint2 getCallbackEndpoint() { + public Endpoint getCallbackEndpoint() { return callbackEndpoint; } - public void setCallbackEndpoint(Endpoint2 callbackEndpoint) { + public void setCallbackEndpoint(Endpoint callbackEndpoint) { this.callbackEndpoint = callbackEndpoint; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java index 89a6508a24..454a24225f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.Callback; import org.apache.tuscany.sca.assembly.ComponentReference; import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.interfacedef.InterfaceContract; @@ -41,7 +41,7 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C private List<ComponentService> targets = new ArrayList<ComponentService>(); private Callback callback; private boolean promotionOverride; - private List<EndpointReference2> endpointReferences = new ArrayList<EndpointReference2>(); + private List<EndpointReference> endpointReferences = new ArrayList<EndpointReference>(); /** * Constructs a new reference. @@ -56,10 +56,10 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C clone.targets = new ArrayList<ComponentService>(targets); // clone the endpoint references themselves and set the reference pointer back to // this new refrence - clone.endpointReferences = new ArrayList<EndpointReference2>(); + clone.endpointReferences = new ArrayList<EndpointReference>(); - for (EndpointReference2 epr : endpointReferences){ - EndpointReference2 eprClone = (EndpointReference2)epr.clone(); + for (EndpointReference epr : endpointReferences){ + EndpointReference eprClone = (EndpointReference)epr.clone(); eprClone.setReference((ComponentReference)clone); clone.endpointReferences.add(eprClone); } @@ -125,7 +125,7 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C return getInterfaceContract(); } - public List<EndpointReference2> getEndpointReferences() { + public List<EndpointReference> getEndpointReferences() { return endpointReferences; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java index a4010400e2..8f1ce29fdb 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.Callback; -import org.apache.tuscany.sca.assembly.Endpoint2; +import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.interfacedef.InterfaceContract; @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; public class ServiceImpl extends AbstractServiceImpl implements Service, Cloneable { private List<Binding> bindings = new ArrayList<Binding>(); private Callback callback; - private List<Endpoint2> endpoints = new ArrayList<Endpoint2>(); + private List<Endpoint> endpoints = new ArrayList<Endpoint>(); /** @@ -92,7 +92,7 @@ public class ServiceImpl extends AbstractServiceImpl implements Service, Cloneab return getInterfaceContract(); } - public List<Endpoint2> getEndpoints() { + public List<Endpoint> getEndpoints() { return endpoints; } } |