From 71fbc37a1efd6118cb8e49f9e53b5ffbe7e85449 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 24 Sep 2009 18:59:52 +0000 Subject: Refactor the CompositeBuilder interface to return Composite instead of void so that a builder can create a new instance of Composite git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@818588 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/assembly/builder/CompositeBuilder.java | 11 ++++--- .../builder/DefaultBuilderExtensionPoint.java | 8 ++--- .../assembly/builder/DeployedCompositeBuilder.java | 3 +- .../impl/ComponentConfigurationBuilderImpl.java | 3 +- .../impl/ComponentReferenceBindingBuilderImpl.java | 3 +- ...onentReferenceEndpointReferenceBuilderImpl.java | 3 +- .../ComponentReferencePromotionBuilderImpl.java | 3 +- ...ComponentReferencePromotionWireBuilderImpl.java | 3 +- .../impl/ComponentReferenceWireBuilderImpl.java | 3 +- .../impl/ComponentServiceBindingBuilderImpl.java | 3 +- .../impl/ComponentServiceEndpointBuilderImpl.java | 3 +- .../impl/ComponentServicePromotionBuilderImpl.java | 3 +- .../CompositeBindingConfigurationBuilderImpl.java | 3 +- .../impl/CompositeBindingURIBuilderImpl.java | 6 ++-- .../builder/impl/CompositeBuilderImpl.java | 35 ++++++++++++---------- .../builder/impl/CompositeCloneBuilderImpl.java | 3 +- .../builder/impl/CompositeIncludeBuilderImpl.java | 3 +- .../builder/impl/CompositePolicyBuilderImpl.java | 3 +- .../impl/CompositePromotionBuilderImpl.java | 3 +- ...CompositeReferenceConfigurationBuilderImpl.java | 3 +- .../impl/CompositeReferenceWireBuilderImpl.java | 3 +- .../impl/CompositeServiceBindingBuilderImpl.java | 3 +- .../CompositeServiceConfigurationBuilderImpl.java | 3 +- .../impl/CompositeServicePromotionBuilderImpl.java | 3 +- .../assembly/builder/impl/EndpointBuilderImpl.java | 3 +- .../builder/impl/EndpointReferenceBuilderImpl.java | 3 +- .../assembly/builder/impl/ModelBuilderImpl.java | 20 ++++++------- .../builder/impl/PolicyAttachmentBuilderImpl.java | 4 +-- 28 files changed, 90 insertions(+), 60 deletions(-) (limited to 'java/sca/modules') diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java index b1c4b4e486..e6aaa2d4bb 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java @@ -34,18 +34,21 @@ public interface CompositeBuilder { /** * Returns the ID of the builder. * - * @return + * @return An ID that identifies the builder */ String getID(); /** * Build a composite. * - * @param composite - * @param definitions + * @param composite The composite + * @param definitions SCA definitions * @param monitor + * @return The composite built from the original one. In most cases, it is the same as the orginal one as + * most builders only change the content of the composite. + * * @throws CompositeBuilderException */ - void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException; + Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java index b0fea72f24..2464fb77dc 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java @@ -213,16 +213,16 @@ public class DefaultBuilderExtensionPoint implements BuilderExtensionPoint, Life return id; } - public void build(Composite composite, Definitions definitions, Monitor monitor) + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { - getBuilder().build(composite, definitions, monitor); + return getBuilder().build(composite, definitions, monitor); } - public void build(Composite composite, + public Composite build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) throws CompositeBuilderException { - ((DeployedCompositeBuilder)getBuilder()).build(composite, definitions, bindingBaseURIs, monitor); + return ((DeployedCompositeBuilder)getBuilder()).build(composite, definitions, bindingBaseURIs, monitor); } private CompositeBuilder getBuilder() { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DeployedCompositeBuilder.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DeployedCompositeBuilder.java index bba61a5961..75c7b676e8 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DeployedCompositeBuilder.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DeployedCompositeBuilder.java @@ -49,9 +49,10 @@ public interface DeployedCompositeBuilder { * @param composite * @param definitions * @param monitor + * @return * @throws CompositeBuilderException */ - void build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) + Composite build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) throws CompositeBuilderException; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java index 34917a3cd9..9d697a67a7 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java @@ -58,8 +58,9 @@ public class ComponentConfigurationBuilderImpl extends BaseBuilderImpl implement return "org.apache.tuscany.sca.assembly.builder.ComponentConfigurationBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { configureComponents(composite, definitions, monitor); + return composite; } /** diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java index 4aa92e36a8..527a66b780 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java @@ -46,8 +46,9 @@ public class ComponentReferenceBindingBuilderImpl implements CompositeBuilder { this.builders = registry.getExtensionPoint(BuilderExtensionPoint.class); } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { buildReferenceBindings(composite, monitor); + return composite; } public String getID() { 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 f865c36263..cb73848a51 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 @@ -70,11 +70,12 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * * @param composite */ - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { this.monitor = monitor; // process component services processComponentReferences(composite); + return composite; } private void processComponentReferences(Composite composite) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java index b4f3516bd3..2bac74bbed 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java @@ -49,8 +49,9 @@ public class ComponentReferencePromotionBuilderImpl implements CompositeBuilder this.assemblyFactory = factories.getFactory(AssemblyFactory.class); } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { configureNestedCompositeReferences(composite, monitor); + return composite; } public String getID() { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java index 87e622ee35..281f5dab95 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java @@ -46,8 +46,9 @@ public class ComponentReferencePromotionWireBuilderImpl implements CompositeBuil this.assemblyFactory = assemblyFactory; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { wireCompositeReferences(composite, monitor); + return composite; } public String getID() { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java index 53221fd3c5..65559bcfdd 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java @@ -50,8 +50,9 @@ public class ComponentReferenceWireBuilderImpl extends BaseBuilderImpl implement return "org.apache.tuscany.sca.assembly.builder.ComponentReferenceWireBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { wireComponentReferences(composite, monitor); + return composite; } /** diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java index 67404402b1..83ae773e1b 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java @@ -49,8 +49,9 @@ public class ComponentServiceBindingBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.assembly.builder.ComponentServiceBindingBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { buildServiceBindings(composite, monitor); + return composite; } private void buildServiceBindings(Composite composite, Monitor monitor) { 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 89b98ad9ad..dae85d4736 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 @@ -66,13 +66,14 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder { * @param definitions * @param monitor - a Monitor for logging errors */ - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // process component services if (!useNew) { processComponentServices(composite); } // end if processComponentServices2(composite); + return composite; } // end method build diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java index 32d1cfc690..94b3e6290a 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java @@ -47,10 +47,11 @@ public class ComponentServicePromotionBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.assembly.builder.ComponentServicePromotionBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // Process nested composites recursively configureNestedCompositeServices(composite); + return composite; } private void configureNestedCompositeServices(Composite composite) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java index 417c0b60e0..291f418c1a 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java @@ -49,7 +49,7 @@ public class CompositeBindingConfigurationBuilderImpl extends CompositeBindingUR return "org.apache.tuscany.sca.assembly.builder.CompositeServiceBindingBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { List defaultBindings = null; for (Object x : composite.getExtensions()) { if (x instanceof List) { @@ -58,6 +58,7 @@ public class CompositeBindingConfigurationBuilderImpl extends CompositeBindingUR } // TODO - EPR - is this ever used? //configureBindingURIs(composite, definitions, defaultBindings, monitor); + return composite; } } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java index 5bda39dda2..26d9a62b3f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java @@ -60,16 +60,18 @@ public class CompositeBindingURIBuilderImpl extends BaseBuilderImpl implements C return "org.apache.tuscany.sca.assembly.builder.CompositeBindingURIBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { configureBindingURIsAndNames(composite, definitions, monitor); + return composite; } - public void build(Composite composite, + public Composite build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) throws CompositeBuilderException { configureBindingURIs(composite, null, definitions, bindingBaseURIs, monitor); configureBindingNames(composite, monitor); + return composite; } /** diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java index a74278b0b9..143e4e7850 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java @@ -106,11 +106,12 @@ public class CompositeBuilderImpl implements CompositeBuilder, DeployedComposite return "org.apache.tuscany.sca.assembly.builder.CompositeBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { build(composite, definitions, null, monitor); + return composite; } - public void build(Composite composite, + public Composite build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) throws CompositeBuilderException { @@ -118,28 +119,28 @@ public class CompositeBuilderImpl implements CompositeBuilder, DeployedComposite try { // Collect and fuse includes - compositeIncludeBuilder.build(composite, definitions, monitor); + composite = compositeIncludeBuilder.build(composite, definitions, monitor); // Expand nested composites - compositeCloneBuilder.build(composite, definitions, monitor); + composite = compositeCloneBuilder.build(composite, definitions, monitor); // Configure all components - componentConfigurationBuilder.build(composite, definitions, monitor); + composite = componentConfigurationBuilder.build(composite, definitions, monitor); // Connect composite services/references to promoted services/references - compositePromotionBuilder.build(composite, definitions, monitor); + composite = compositePromotionBuilder.build(composite, definitions, monitor); // Configure composite services by copying bindings up the promotion // hierarchy overwriting automatic bindings with those added manually - compositeServiceConfigurationBuilder.build(composite, definitions, monitor); + composite = compositeServiceConfigurationBuilder.build(composite, definitions, monitor); // Configure composite references by copying bindings down promotion // hierarchy overwriting automatic bindings with those added manually - compositeReferenceConfigurationBuilder.build(composite, definitions, monitor); + composite = compositeReferenceConfigurationBuilder.build(composite, definitions, monitor); // Configure service binding URIs and names. Creates an SCA defined URI based // on the scheme base URI, the component name and the binding name - ((DeployedCompositeBuilder)compositeBindingURIBuilder).build(composite, definitions, bindingBaseURIs, monitor); + composite = ((DeployedCompositeBuilder)compositeBindingURIBuilder).build(composite, definitions, bindingBaseURIs, monitor); // Create $promoted$ component services on bottom level components // to represent promoted services @@ -154,20 +155,20 @@ public class CompositeBuilderImpl implements CompositeBuilder, DeployedComposite // Perform and service binding related build activities. The binding // will provide the builder. - componentServiceBindingBuilder.build(composite, definitions, monitor); + composite = componentServiceBindingBuilder.build(composite, definitions, monitor); // create endpoints on component services. - componentServiceEndpointBuilder.build(composite, definitions, monitor); + composite = componentServiceEndpointBuilder.build(composite, definitions, monitor); // Apply any wires in the composite to create new component reference targets - componentReferenceWireBuilder.build(composite, definitions, monitor); + composite = componentReferenceWireBuilder.build(composite, definitions, monitor); // create reference endpoint reference models - componentReferenceEndpointReferenceBuilder.build(composite, definitions, monitor); + composite = componentReferenceEndpointReferenceBuilder.build(composite, definitions, monitor); // Push down configuration from promoted references to the // references they promote - componentReferencePromotionBuilder.build(composite, definitions, monitor); + composite = componentReferencePromotionBuilder.build(composite, definitions, monitor); // Push down configuration from promoted references to the // references they promote @@ -180,10 +181,12 @@ public class CompositeBuilderImpl implements CompositeBuilder, DeployedComposite // Perform and reference binding related build activities. The binding // will provide the builder. - componentReferenceBindingBuilder.build(composite, definitions, monitor); + composite = componentReferenceBindingBuilder.build(composite, definitions, monitor); // Compute the policies across the model hierarchy - compositePolicyBuilder.build(composite, definitions, monitor); + composite = compositePolicyBuilder.build(composite, definitions, monitor); + + return composite; } catch (Exception e) { throw new CompositeBuilderException("Exception while building composite " + composite.getName(), e); } // end try diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java index d489e81d6b..b5476805ad 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java @@ -41,8 +41,9 @@ public class CompositeCloneBuilderImpl implements CompositeBuilder { public CompositeCloneBuilderImpl() { } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { expandCompositeImplementations(composite); + return composite; } public String getID() { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java index 1bd52cbe6f..2f9fee7a3a 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java @@ -46,8 +46,9 @@ public class CompositeIncludeBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.assembly.builder.CompositeIncludeBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { fuseIncludes(composite, monitor); + return composite; } /** 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 5d4a44f137..fbffb2c4ab 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 @@ -61,8 +61,9 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo return "org.apache.tuscany.sca.assembly.builder.CompositePolicyBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { computePolicies(composite, definitions, monitor); + return composite; } /** diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java index 21c8596ea4..fffc63626f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java @@ -55,8 +55,9 @@ public class CompositePromotionBuilderImpl extends BaseBuilderImpl implements Co return "org.apache.tuscany.sca.assembly.builder.CompositePromotionBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { connectCompositeReferencesAndServices(composite, monitor); + return composite; } /** diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java index 702da49f54..c50caa245b 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java @@ -55,7 +55,7 @@ public class CompositeReferenceConfigurationBuilderImpl implements CompositeBuil return "org.apache.tuscany.sca.assembly.builder.CompositeReferenceConfigurationBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // Process nested composites recursively configureNestedCompositeReferences(composite); @@ -115,6 +115,7 @@ public class CompositeReferenceConfigurationBuilderImpl implements CompositeBuil } } } + return composite; } private void configureNestedCompositeReferences(Composite composite) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java index d74386cf33..19bc339b05 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java @@ -53,7 +53,7 @@ public class CompositeReferenceWireBuilderImpl implements CompositeBuilder { * * @param composite */ - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // Process composite references declared in this composite for (Reference reference : composite.getReferences()) { @@ -91,6 +91,7 @@ public class CompositeReferenceWireBuilderImpl implements CompositeBuilder { } } } + return composite; } } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java index d42ed75518..f023bc869c 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java @@ -50,8 +50,9 @@ public class CompositeServiceBindingBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.assembly.builder.CompositeServiceBindingBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { buildServiceBindings(composite, monitor); + return composite; } private void buildServiceBindings(Composite composite, Monitor monitor) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java index 9bbfabf12a..8e6b5419dc 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java @@ -53,7 +53,7 @@ public class CompositeServiceConfigurationBuilderImpl implements CompositeBuilde return "org.apache.tuscany.sca.assembly.builder.CompositeServiceConfigurationBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // Process nested composites recursively configureNestedCompositeServices(composite); @@ -98,6 +98,7 @@ public class CompositeServiceConfigurationBuilderImpl implements CompositeBuilde } } } + return composite; } private void configureNestedCompositeServices(Composite composite) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java index e5727777fe..84a1a38fb5 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java @@ -46,7 +46,7 @@ public class CompositeServicePromotionBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.assembly.builder.CompositeServicePromotionBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { // Process top level composite services for (Service service : composite.getServices()) { @@ -78,6 +78,7 @@ public class CompositeServicePromotionBuilderImpl implements CompositeBuilder { compositeService.setPromotedService(newComponentService); } } + return composite; } } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java index 55d3f79bec..b05d2bba3e 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java @@ -50,9 +50,10 @@ public class EndpointBuilderImpl { * @param definitions * @param monitor - a Monitor for logging errors */ - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { processComponentServices(composite); + return composite; } // end method build diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointReferenceBuilderImpl.java index ec9386f30f..e59a381c72 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointReferenceBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointReferenceBuilderImpl.java @@ -72,11 +72,12 @@ public class EndpointReferenceBuilderImpl { * * @param composite */ - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { this.monitor = monitor; // process component services processComponentReferences(composite); + return composite; } private void processComponentReferences(Composite composite) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java index 514967af9c..c25f46bc4f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java @@ -77,11 +77,11 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil return "org.apache.tuscany.sca.assembly.builder.CompositeBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { - build(composite, definitions, null, monitor); + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + return build(composite, definitions, null, monitor); } - public void build(Composite composite, + public Composite build(Composite composite, Definitions definitions, Map> bindingBaseURIs, Monitor monitor) throws CompositeBuilderException { @@ -90,14 +90,14 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil // Collect and fuse includes. Copy all of the components // out of the included composite into the including composite // and discards the included composite - compositeIncludeBuilder.build(composite, definitions, monitor); + composite = compositeIncludeBuilder.build(composite, definitions, monitor); // need to apply policy external attachment // Expand nested composites. Clone any composite model that // is acting as a component implementation and connects the cloned // model to the component implementation in question - compositeCloneBuilder.build(composite, definitions, monitor); + composite = compositeCloneBuilder.build(composite, definitions, monitor); // Process the implementation hierarchy by calculating the component type // for the top level implementation (composite). This has the effect of @@ -118,13 +118,13 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil // TODO - called here at the moment but we could have a separate build phase // to call these. Also we need to re-org these builders bindingURIBuilder.configureBindingURIsAndNames(composite, definitions, monitor); - componentServiceBindingBuilder.build(composite, definitions, monitor); // binding specific build - componentReferenceBindingBuilder.build(composite, definitions, monitor); // binding specific build + composite = componentServiceBindingBuilder.build(composite, definitions, monitor); // binding specific build + composite = componentReferenceBindingBuilder.build(composite, definitions, monitor); // binding specific build endpointBuilder.build(composite, definitions, monitor); endpointReferenceBuilder.build(composite, definitions, monitor); - componentReferencePromotionBuilder.build(composite, definitions, monitor); // move into the static build? - compositePolicyBuilder.build(composite, definitions, monitor); // the rest of the policy processing? - + composite = componentReferencePromotionBuilder.build(composite, definitions, monitor); // move into the static build? + composite = compositePolicyBuilder.build(composite, definitions, monitor); // the rest of the policy processing? + return composite; } catch (Exception e) { throw new CompositeBuilderException("Exception while building model " + composite.getName(), e); } diff --git a/java/sca/modules/policy-builder/src/main/java/org/apache/tuscany/sca/policy/builder/impl/PolicyAttachmentBuilderImpl.java b/java/sca/modules/policy-builder/src/main/java/org/apache/tuscany/sca/policy/builder/impl/PolicyAttachmentBuilderImpl.java index 335e677329..98d93d8186 100644 --- a/java/sca/modules/policy-builder/src/main/java/org/apache/tuscany/sca/policy/builder/impl/PolicyAttachmentBuilderImpl.java +++ b/java/sca/modules/policy-builder/src/main/java/org/apache/tuscany/sca/policy/builder/impl/PolicyAttachmentBuilderImpl.java @@ -77,10 +77,10 @@ public class PolicyAttachmentBuilderImpl implements CompositeBuilder { return "org.apache.tuscany.sca.policy.builder.PolicyAttachmentBuilder"; } - public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { + public Composite build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException { try { Composite patched = applyXPath(composite, definitions, monitor); - System.out.println(patched); + return patched; } catch (Exception e) { throw new CompositeBuilderException(e); } -- cgit v1.2.3