TUSCANY-3213 - move ProblemImpl from assembly.builder.impl to monitor.impl and extend the Monitor interface to allow problems to be created without needing to access and implementation package

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

1 files changed, 135 insertions, 135 deletions

diff --git a/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
index 01c69e0ff9..a973ec07d9 100644
--- a/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
@@ -19,130 +19,130 @@
 
 package org.apache.tuscany.sca.binding.http.xml;
 
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;

-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import org.apache.tuscany.sca.assembly.OperationSelector;

-import org.apache.tuscany.sca.assembly.WireFormat;

-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;

-import org.apache.tuscany.sca.binding.http.HTTPBinding;

-import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.monitor.Monitor;

-import org.apache.tuscany.sca.monitor.Problem;

-import org.apache.tuscany.sca.monitor.Problem.Severity;

-import org.apache.tuscany.sca.policy.PolicyFactory;

-

-public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPBinding> {

-    private static final String BINDING_HTTP = "binding.http";

-    private static final QName BINDING_HTTP_QNAME = new QName(Constants.SCA10_TUSCANY_NS, BINDING_HTTP);

-    

-    private static final String NAME = "name";

-    private static final String URI = "uri";

-    

-    private HTTPBindingFactory httpBindingFactory;

-    private StAXArtifactProcessor<Object> extensionProcessor;

-    private StAXAttributeProcessor<Object> extensionAttributeProcessor;

-    private PolicyFactory policyFactory;

-    private PolicyAttachPointProcessor policyProcessor;

-    private Monitor monitor;

-

-    public HTTPBindingProcessor(ExtensionPointRegistry extensionPoints, 

-                                StAXArtifactProcessor extensionProcessor,

-                                StAXAttributeProcessor extensionAttributeProcessor, 

-                                Monitor monitor) {

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

-        this.httpBindingFactory = modelFactories.getFactory(HTTPBindingFactory.class);

-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;

-        this.extensionAttributeProcessor = extensionAttributeProcessor;

-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);

-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);

-        this.monitor = monitor;

-    }

-    

-    public QName getArtifactType() {

-        return BINDING_HTTP_QNAME;

-    }

-    

-    public Class<HTTPBinding> getModelType() {

-        return HTTPBinding.class;

-    }

-

-    public HTTPBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        HTTPBinding httpBinding = httpBindingFactory.createHTTPBinding();

-        

-        // Read policies

-        policyProcessor.readPolicies(httpBinding, reader);

-        

-        while(reader.hasNext()) {

-            QName elementName = null;

-            int event = reader.getEventType();

-            switch (event) {

-                case START_ELEMENT:

-                    elementName = reader.getName();

-                     

-                     if (BINDING_HTTP_QNAME.equals(elementName)) {

-                         String name = getString(reader, NAME);

-                         if(name != null) {

-                             httpBinding.setName(name);

-                         }

-                         

-                         String uri = getString(reader, URI);

-                         if (uri != null) {

-                             httpBinding.setURI(uri);

-                         }

-                     } else {

-                         // Read an extension element

-                         Object extension = extensionProcessor.read(reader);

-                         if (extension != null) {

-                             if (extension instanceof WireFormat) {

-                                 httpBinding.setRequestWireFormat((WireFormat)extension);

-                             } else if(extension instanceof OperationSelector) {

-                                 httpBinding.setOperationSelector((OperationSelector)extension);

-                             }

-                         }

-                     }

- 

-            }

-            

-            if (event == END_ELEMENT && BINDING_HTTP_QNAME.equals(reader.getName())) {

-                break;

-            }

-            

-            // Read the next element

-            if (reader.hasNext()) {

-                reader.next();

-            }

-        }

-

-        return httpBinding;

+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.OperationSelector;
+import org.apache.tuscany.sca.assembly.WireFormat;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
+import org.apache.tuscany.sca.binding.http.HTTPBinding;
+import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPBinding> {
+    private static final String BINDING_HTTP = "binding.http";
+    private static final QName BINDING_HTTP_QNAME = new QName(Constants.SCA10_TUSCANY_NS, BINDING_HTTP);
+    
+    private static final String NAME = "name";
+    private static final String URI = "uri";
+    
+    private HTTPBindingFactory httpBindingFactory;
+    private StAXArtifactProcessor<Object> extensionProcessor;
+    private StAXAttributeProcessor<Object> extensionAttributeProcessor;
+    private PolicyFactory policyFactory;
+    private PolicyAttachPointProcessor policyProcessor;
+    private Monitor monitor;
+
+    public HTTPBindingProcessor(ExtensionPointRegistry extensionPoints, 
+                                StAXArtifactProcessor extensionProcessor,
+                                StAXAttributeProcessor extensionAttributeProcessor, 
+                                Monitor monitor) {
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        this.httpBindingFactory = modelFactories.getFactory(HTTPBindingFactory.class);
+        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
+        this.extensionAttributeProcessor = extensionAttributeProcessor;
+        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+        this.monitor = monitor;
+    }
+    
+    public QName getArtifactType() {
+        return BINDING_HTTP_QNAME;
+    }
+    
+    public Class<HTTPBinding> getModelType() {
+        return HTTPBinding.class;
     }
 
-    public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {

-        //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);

-        

-        writeStart(writer, BINDING_HTTP_QNAME.getNamespaceURI(), BINDING_HTTP_QNAME.getLocalPart());

+    public HTTPBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        HTTPBinding httpBinding = httpBindingFactory.createHTTPBinding();
+        
+        // Read policies
+        policyProcessor.readPolicies(httpBinding, reader);
+        
+        while(reader.hasNext()) {
+            QName elementName = null;
+            int event = reader.getEventType();
+            switch (event) {
+                case START_ELEMENT:
+                    elementName = reader.getName();
+                     
+                     if (BINDING_HTTP_QNAME.equals(elementName)) {
+                         String name = getString(reader, NAME);
+                         if(name != null) {
+                             httpBinding.setName(name);
+                         }
+                         
+                         String uri = getString(reader, URI);
+                         if (uri != null) {
+                             httpBinding.setURI(uri);
+                         }
+                     } else {
+                         // Read an extension element
+                         Object extension = extensionProcessor.read(reader);
+                         if (extension != null) {
+                             if (extension instanceof WireFormat) {
+                                 httpBinding.setRequestWireFormat((WireFormat)extension);
+                             } else if(extension instanceof OperationSelector) {
+                                 httpBinding.setOperationSelector((OperationSelector)extension);
+                             }
+                         }
+                     }
+ 
+            }
+            
+            if (event == END_ELEMENT && BINDING_HTTP_QNAME.equals(reader.getName())) {
+                break;
+            }
+            
+            // Read the next element
+            if (reader.hasNext()) {
+                reader.next();
+            }
+        }
 
-        //write policies

-        policyProcessor.writePolicyAttributes(httpBinding, writer);

-        

-        // Write binding name

-        if (httpBinding.getName() != null) {

+        return httpBinding;
+    }
+
+    public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+        //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
+        
+        writeStart(writer, BINDING_HTTP_QNAME.getNamespaceURI(), BINDING_HTTP_QNAME.getLocalPart());
+
+        //write policies
+        policyProcessor.writePolicyAttributes(httpBinding, writer);
+        
+        // Write binding name
+        if (httpBinding.getName() != null) {
             writer.writeAttribute(NAME, httpBinding.getName());
         }
 
@@ -163,22 +163,22 @@ public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements S
     }
 
 
-    public void resolve(HTTPBinding model, ModelResolver resolver) throws ContributionResolveException {      

-        policyProcessor.resolvePolicies(model, resolver);    

+    public void resolve(HTTPBinding model, ModelResolver resolver) throws ContributionResolveException {      
+        policyProcessor.resolvePolicies(model, resolver);    
     }
     
-    /**

-     * Report a error.

-     * 

-     * @param problems

-     * @param message

-     * @param model

-     */

-    private void error(String message, Object model, Object... messageParameters) {

-         if (monitor != null) {

-                Problem problem = new ProblemImpl(this.getClass().getName(), "binding-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);

-                monitor.problem(problem);

-         }

+    /**
+     * Report a error.
+     * 
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(String message, Object model, Object... messageParameters) {
+         if (monitor != null) {
+                Problem problem = new ProblemImpl(this.getClass().getName(), "binding-http-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+                monitor.problem(problem);
+         }
     }
 
 }