TUSCANY-2934 - wire up the wire format writers

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

4 files changed, 107 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
index 92350a6310..b2019bfef6 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
@@ -833,6 +833,14 @@ public class JMSBinding implements BindingRRB, PolicySetAttachPoint, OperationsC
         // Configured operations
         if ( this.configuredOperations.size() != binding.getConfiguredOperations().size() ) return false;
         
+        // wire format
+        if ( this.getRequestWireFormat().getClass() != binding.getRequestWireFormat().getClass()) return false;
+        if ( this.getResponseWireFormat().getClass() != binding.getResponseWireFormat().getClass()) return false;
+        
+        // operation selector
+        if ( this.getOperationSelector().getClass() != binding.getOperationSelector().getClass()) return false;
+        
+        
         // Other fields could also be checked for equality. See class fields for details.
         return true;
     }
diff --git a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
index 384444800c..99a14d6cbb 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
@@ -947,6 +947,12 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
            writeResponseDestinationProperties( jmsBinding, writer );       
            writeResponseConnectionFactoryProperties( jmsBinding, writer );        
            writeResponseActivationSpecProperties( jmsBinding, writer );
+           
+           if ((jmsBinding.getResponseWireFormat() != null) &&
+               !(jmsBinding.getResponseWireFormat() instanceof WireFormatJMSTextXML)){
+               writeWireFormat(jmsBinding.getResponseWireFormat(), writer);
+           }
+           
            writer.writeEndElement();
            // Strange bug. Without white space, headers end tag improperly read. 
            writer.writeCharacters( " " ); 
@@ -956,6 +962,16 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
         
         writeConfiguredOperations( jmsBinding, writer );
         
+        if ((jmsBinding.getRequestWireFormat() != null) &&
+            !(jmsBinding.getRequestWireFormat() instanceof WireFormatJMSTextXML)){
+            writeWireFormat(jmsBinding.getRequestWireFormat(), writer);
+        }
+        
+        if ((jmsBinding.getOperationSelector() != null) &&
+            !(jmsBinding.getOperationSelector() instanceof OperationSelectorJMSDefault)){
+            writeOperationSelector(jmsBinding.getOperationSelector(), writer);
+        }
+        
         writeEnd(writer);
     }
 
@@ -1477,4 +1493,26 @@ public class JMSBindingProcessor extends BaseStAXArtifactProcessor implements St
         writer.writeCharacters(" ");
     }
     
+    /**
+     * Wire out a request or response wire format element. Uses extension processors
+     * to do this as wire format is an extension point
+     * 
+     * @param wireFormat
+     * @param writer
+     */
+    private void writeWireFormat(WireFormat wireFormat, XMLStreamWriter writer ) throws XMLStreamException, ContributionWriteException {
+        extensionProcessor.write(wireFormat, writer);
+    }
+    
+    /**
+     * Wire out an operation selector element. Uses extension processors
+     * to do this as operation selector is an extension point
+     * 
+     * @param operationSeletor
+     * @param writer
+     */
+    private void writeOperationSelector(OperationSelector operationSeletor, XMLStreamWriter writer ) throws XMLStreamException, ContributionWriteException{
+        extensionProcessor.write(operationSeletor, writer);        
+    }
+    
 }
diff --git a/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
index eabe4f7590..7c294b645a 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
@@ -34,6 +34,9 @@ import junit.framework.TestCase;
 import org.apache.tuscany.sca.assembly.Composite;

 import org.apache.tuscany.sca.assembly.ConfiguredOperation;

 import org.apache.tuscany.sca.assembly.OperationsConfigurator;

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

+import org.apache.tuscany.sca.binding.jms.wireformat.jmsbytes.WireFormatJMSBytes;

+import org.apache.tuscany.sca.binding.jms.wireformat.jmsobject.WireFormatJMSObject;

 import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;

 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;

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

@@ -351,6 +354,23 @@ public class JMSBindingProcessorTestCase extends TestCase {
             + "      </service>"

             + " </component>"

             + "</composite>";

+    

+    public static final String WIRE_FORMAT =

+        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 

+        + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://binding-jms\" xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\" name=\"binding-jms\">"

+            + " <component name=\"HelloWorldComponent\">"

+            + "   <implementation.java class=\"services.HelloWorld\"/>"

+            + "      <service name=\"HelloWorldService\">"

+            + "          <binding.jms uri=\"jms:testQueue\" >"

+            + "              <response>" 

+            + "                  <destination name=\"responseConnectionElementName\"/>"            

+            + "                  <tuscany:wireFormat.jmsBytes/>"            

+            + "              </response>"            

+            + "              <tuscany:wireFormat.jmsObject/>"

+            + "          </binding.jms>"

+            + "      </service>"

+            + " </component>"

+            + "</composite>";     

 

     private XMLInputFactory inputFactory;

     private StAXArtifactProcessor<Object> staxProcessor;

@@ -692,4 +712,24 @@ public class JMSBindingProcessorTestCase extends TestCase {
         assertEquals(opConfig.getConfiguredOperations().get(0).getRequiredIntents().size(), 2);

     }

 

+    /**

+     * Tests the APIs:

+     *     public WireFormat getRequstWireFormat();

+     *     public WireFormat getResponseWireFormat();

+     * 

+     * @throws Exception

+     */

+    public void testWireFormat() throws Exception {

+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(WIRE_FORMAT));

+        

+        Composite composite = (Composite)staxProcessor.read(reader);

+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);        

+        assertNotNull(binding);

+        

+        WireFormat requestWireFormat = binding.getRequestWireFormat();

+        assertEquals(WireFormatJMSObject.class, requestWireFormat.getClass());

+        

+        WireFormat responseWireFormat = binding.getResponseWireFormat();

+        assertEquals(WireFormatJMSBytes.class, responseWireFormat.getClass());

+    }    

 }

diff --git a/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java b/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
index d40d69d4c6..d9427407e5 100644
--- a/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
@@ -361,4 +361,25 @@ public class JMSBindingProcessorWriteTestCase extends TestCase {
         // Compare initial binding to written binding.
         assertEquals(binding, binding2);
     }
+    
+    public void testWireFormat() throws Exception {
+        XMLStreamReader reader =
+            inputFactory.createXMLStreamReader(new StringReader(JMSBindingProcessorTestCase.WIRE_FORMAT));
+        Composite composite = (Composite)staxProcessor.read(reader);
+        JMSBinding binding = (JMSBinding)composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
+        assertNotNull(binding);
+
+        // Write out JMSBinding model to stream.
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
+
+        // Read written JMSBinding to a different JMSBinding model.
+        XMLStreamReader reader2 = inputFactory.createXMLStreamReader(new StringReader(bos.toString()));
+        Composite composite2 = (Composite)staxProcessor.read(reader2);
+        JMSBinding binding2 = (JMSBinding)composite2.getComponents().get(0).getServices().get(0).getBindings().get(0);
+        assertNotNull(binding2);
+
+        // Compare initial binding to written binding.
+        assertEquals(binding, binding2);
+    }    
 }