TUSCANY-2968 - Adding new binding processor and making necessary adjustment to move to spec namespace

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

6 files changed, 225 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index 6192b92dfe..d4ad8d2602 100644
--- a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
@@ -28,4 +28,5 @@ import org.apache.tuscany.sca.assembly.Binding;
  * @version $Rev$ $Date$
 */
 public interface HTTPBinding extends Binding {
+    
 }
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index 370e4cdb67..e66896c68e 100644
--- a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
@@ -30,6 +30,6 @@ public interface HTTPBindingFactory {
      * Creates a new HTTP binding.
      * @return a new HTTP binding
      */
-    HTTPBinding createHTTPResourceBinding();
+    HTTPBinding createHTTPBinding();
 
 }
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 7e72b7dd85..678cd1a426 100644
--- a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
@@ -29,7 +29,7 @@ import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
  */
 public class HTTPBindingFactoryImpl implements HTTPBindingFactory {
 
-    public HTTPBinding createHTTPResourceBinding() {
+    public HTTPBinding createHTTPBinding() {
         return new HTTPBindingImpl();
     }
 
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
new file mode 100644
index 0000000000..f5b32a8ea0
--- /dev/null
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.http.xml;
+
+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.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.assembly.xml.Constants;
+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.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.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+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_NS, BINDING_HTTP);
+    
+    private static final String NAME = "name";
+    private static final String URI = "uri";
+    
+    private HTTPBindingFactory httpBindingFactory;
+    private Monitor monitor;
+
+    public HTTPBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+        this.httpBindingFactory = modelFactories.getFactory(HTTPBindingFactory.class);
+        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();
+
+        String name = getString(reader, NAME);
+        if(name != null) {
+            httpBinding.setName(name);
+        }
+        
+        String uri = getString(reader, URI);
+        if (uri != null) {
+            httpBinding.setURI(uri);
+        }
+
+        return httpBinding;
+    }
+
+    public void write(HTTPBinding httpBinding, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+        writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
+        
+        // Write binding name
+        if (httpBinding.getName() != null) {
+            writer.writeAttribute(NAME, httpBinding.getName());
+        }
+
+        // Write binding URI
+        if (httpBinding.getURI() != null) {
+            writer.writeAttribute(URI, httpBinding.getURI());
+        }
+        
+        writer.writeEndElement();
+    }
+
+
+    public void resolve(HTTPBinding model, ModelResolver resolver) throws ContributionResolveException {
+        // Should not need to do anything here for now... 
+        
+    }
+    
+    /**
+     * 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(), "impl-bpel-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+                monitor.problem(problem);
+         }
+    }
+
+}
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cc07784cb7..bbdf9414c8 100644
--- a/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+org.apache.tuscany.sca.binding.http.xml.HTTPBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
new file mode 100644
index 0000000000..46025e0311
--- /dev/null
+++ b/branches/sca-java-1.x/modules/binding-http-oasis/src/test/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessorTestCase.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.binding.http.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.binding.http.HTTPBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class HTTPBindingProcessorTestCase {
+
+    private static final String XML = "<binding.http name=\"name\" uri=\"uri\" />";
+    
+    private static XMLInputFactory inputFactory;
+    private static XMLOutputFactory outputFactory;
+
+    private static Monitor monitor;
+
+    private static HTTPBindingProcessor httpBindingProcessor;
+    
+    @BeforeClass
+    public static void setUp() throws Exception {
+        inputFactory = XMLInputFactory.newInstance();
+        outputFactory = XMLOutputFactory.newInstance();
+        
+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        // Create a monitor
+        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
+        if (monitorFactory != null) {
+                monitor = monitorFactory.createMonitor();
+                utilities.addUtility(monitorFactory);
+        }
+        
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        httpBindingProcessor = new HTTPBindingProcessor(modelFactories, monitor);
+    }
+    
+    
+    /**
+     * Read and Write a composite using the HTTP Binding
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testReadWriteCompositeWithHTTPBinding() throws Exception {
+
+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
+        reader.next();
+        
+        HTTPBinding httpBinding = (HTTPBinding) httpBindingProcessor.read(reader);
+        assertNotNull(httpBinding);
+        reader.close();
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);
+        writer.setDefaultNamespace("http://www.osoa.org/xmlns/sca/1.0");
+        httpBindingProcessor.write(httpBinding, writer);
+        writer.writeEndDocument();
+        
+        // used for debug comparison
+        // System.out.println(XML);
+        // System.out.println(bos.toString());
+
+        assertEquals(XML, bos.toString());      
+    }
+}