Add PolicyBuilder to the builder extension point

Use QName as the key to index and look up builders

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@824540 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 68 insertions, 4 deletions

diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 971a64c91b..27d13442cd 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
@@ -65,7 +65,6 @@ import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.PolicySubject;
 import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
@@ -125,7 +124,7 @@ public class ComponentBuilderImpl {
             // first carry out any implementation specific builder processing
             Implementation impl = component.getImplementation();
             if (impl != null) {
-                ImplementationBuilder builder = builders.getImplementationBuilder(impl.getClass());
+                ImplementationBuilder builder = builders.getImplementationBuilder(impl.getType());
                 if (builder != null) {
                     builder.build(component, impl, monitor);
                 }
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
index f2b5f341e1..09d37cacb6 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
@@ -62,7 +62,7 @@ public class ComponentReferenceBindingBuilderImpl implements CompositeBuilder {
         for (Component component : composite.getComponents()) {
             for (ComponentReference componentReference : component.getReferences()) {
                 for (Binding binding : componentReference.getBindings()) {
-                    BindingBuilder builder = builders.getBindingBuilder(binding.getClass());
+                    BindingBuilder builder = builders.getBindingBuilder(binding.getType());
                     if (builder != null) {
                         builder.build(component, componentReference, binding, monitor);
                     }
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
index c2a4079598..7fe0689c23 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
@@ -69,7 +69,7 @@ public class ComponentServiceBindingBuilderImpl implements CompositeBuilder {
         for (Component component : composite.getComponents()) {
             for (ComponentService componentService : component.getServices()) {
                 for (Binding binding : componentService.getBindings()) {
-                    BindingBuilder builder = builders.getBindingBuilder(binding.getClass());
+                    BindingBuilder builder = builders.getBindingBuilder(binding.getType());
                     if (builder != null) {
                         builder.build(component, componentService, binding, monitor);
                     }
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
index b76bb20b99..d176db39d2 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
@@ -19,9 +19,12 @@
 
 package org.apache.tuscany.sca.builder.impl;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentReference;
@@ -36,11 +39,13 @@ import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.PolicyBuilder;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentMap;
+import org.apache.tuscany.sca.policy.PolicyExpression;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.PolicySubject;
 import org.apache.tuscany.sca.policy.Qualifier;
@@ -64,6 +69,7 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo
     public Composite build(Composite composite, Definitions definitions, Monitor monitor)
         throws CompositeBuilderException {
         computePolicies(composite, definitions, monitor);
+        buildPolicies(composite, definitions, monitor);
         return composite;
     }
 
@@ -407,4 +413,63 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo
             // How to deal with implementation level policySets/intents
         }
     }
+    
+    private Set<QName> getPolicyNames(PolicySubject subject) {
+        if (subject == null) {
+            return Collections.emptySet();
+        }
+        Set<QName> names = new HashSet<QName>();
+        for (PolicySet ps : subject.getPolicySets()) {
+            for (PolicyExpression exp : ps.getPolicies()) {
+                names.add(exp.getName());
+            }
+        }
+        return names;
+    }
+    
+    protected void buildPolicies(Composite composite, Definitions definitions, Monitor monitor) {
+
+        // compute policies recursively
+        for (Component component : composite.getComponents()) {
+            Implementation implementation = component.getImplementation();
+            if (implementation instanceof Composite) {
+                buildPolicies((Composite)implementation, definitions, monitor);
+            }
+        }
+
+        for (Component component : composite.getComponents()) {
+
+            for (ComponentService componentService : component.getServices()) {
+                for (Endpoint ep : componentService.getEndpoints()) {
+                    for (QName policyType : getPolicyNames(ep)) {
+                        PolicyBuilder builder = builders.getPolicyBuilder(policyType);
+                        if (builder != null) {
+                            builder.build(ep, definitions, monitor);
+                        }
+                    }
+                }
+            }
+
+            for (ComponentReference componentReference : component.getReferences()) {
+                for (EndpointReference epr : componentReference.getEndpointReferences()) {
+                    for (QName policyType : getPolicyNames(epr)) {
+                        PolicyBuilder builder = builders.getPolicyBuilder(policyType);
+                        if (builder != null) {
+                            builder.build(epr, definitions, monitor);
+                        }
+                    }
+                }
+            }
+
+            Implementation implementation = component.getImplementation();
+            if (implementation != null) {
+                for (QName policyType : getPolicyNames(implementation)) {
+                    PolicyBuilder builder = builders.getPolicyBuilder(policyType);
+                    if (builder != null) {
+                        builder.build(component, implementation, definitions, monitor);
+                    }
+                }
+            }
+        }
+    }
 }