You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by be...@apache.org on 2009/02/06 20:47:41 UTC

svn commit: r741694 - in /tuscany/branches/sca-java-1.x/modules/binding-jms/src: main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java

Author: beckerdo
Date: Fri Feb  6 19:47:41 2009
New Revision: 741694

URL: http://svn.apache.org/viewvc?rev=741694&view=rev
Log:
TUSCANY-2821 Added JMS Binding APIs public Set<String> getOperationNames() and public Object getOperationProperty(String opName, String propName ).

Modified:
    tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
    tuscany/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java

Modified: tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java?rev=741694&r1=741693&r2=741694&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java Fri Feb  6 19:47:41 2009
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.tuscany.sca.assembly.BindingRRB;
 import org.apache.tuscany.sca.assembly.OperationSelector;
@@ -492,6 +493,17 @@
         properties.put(name, value);
     }
 
+    /**
+     * Provides key set of operation names in this binding.
+     * @return a Set<String> of operation names
+     */
+    public Set<String> getOperationNames() {
+        // Make a defensive copy since key changes affect map, map changes affect keys.
+        Set<String> opNames = operationProperties.keySet();
+        Set<String> opNamesCopy = new TreeSet<String>( opNames );
+        return opNamesCopy;
+    }
+    
     public Map<String, Object> getOperationProperties(String opName) {
         return operationProperties.get(opName);
     }
@@ -505,6 +517,21 @@
         props.put(propName, value);
     }
 
+    /**
+     * Provides the value of a property for a given operation
+     * @param opName is the name of the operation in this binding.
+     * @param propName is the key name for the property
+     * @return Object representing the property value for this property name. Returns
+     * null for non existant operation name or property name.
+     */
+    public Object getOperationProperty(String opName, String propName ) {
+        Map<String, Object> props = operationProperties.get(opName);
+        if (props == null) { 
+            return null;
+        }
+        return props.get(propName);
+    }
+
     public boolean hasNativeOperationName(String opName) {
         return nativeOperationNames.containsKey(opName);
     }

Modified: tuscany/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java?rev=741694&r1=741693&r2=741694&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java Fri Feb  6 19:47:41 2009
@@ -20,7 +20,9 @@
 package org.apache.tuscany.sca.binding.jms.impl;
 
 import java.io.StringReader;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -579,4 +581,39 @@
         assertEquals(null, bp2.getType());
         assertEquals("bla", bp2.getValue().toString().trim());
     }
+
+    /**
+     * Tests the APIs:
+     *     public Set<String> getOperationNames();
+     *     public Object getOperationProperty(String opName, String propName );
+     * @throws Exception
+     */
+    public void testOpProperties2() throws Exception {
+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(OP_PROPERTIES1));
+        
+        Composite composite = (Composite)staxProcessor.read(reader);
+        JMSBinding binding = (JMSBinding)   composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
+        
+        assertNotNull(binding);
+
+        Set<String> opNames = binding.getOperationNames();
+        assertEquals( 2, opNames.size() );
+        // Recall that order is not guaranteed iterating over a set.
+        for (Iterator<String> it=opNames.iterator(); it.hasNext(); ) {
+            String opName = it.next();
+            assertTrue( opName.equals( "op1") || opName.equals( "op2"));
+        }
+
+        Object value = binding.getOperationProperty( "op1", "p1" );
+        assertEquals("bla", value);
+        value = binding.getOperationProperty( "op1", "intProp" );
+        assertEquals(42, ((Integer)value).intValue());
+        
+        value = binding.getOperationProperty( "op2", "p2" );
+        assertEquals("op2bla", value);
+        value = binding.getOperationProperty( "op2", "intProp" );
+        assertEquals(77, ((Integer)value).intValue());
+    }
+
+
 }