[jboss-svn-commits] JBL Code SVN: r24897 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src: test/java/org/jboss/soa/esb/actions/soap/wise and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-01-23 13:30:15 -0500 (Fri, 23 Jan 2009)
New Revision: 24897

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/wise/SOAPClientUnitTest.java
Log:
Added check if operationName is missing and if so setting operationName to soapAction.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java	2009-01-23 18:10:31 UTC (rev 24896)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java	2009-01-23 18:30:15 UTC (rev 24897)
@@ -167,7 +167,7 @@
     private final String endPointName;
     private final String smooksRequestMapperURL;
     private final String smooksResponseMapperURL;
-    private final String operationName;
+    private String operationName;
     private String serviceName;
     private final String username;
     private final String password;
@@ -185,7 +185,6 @@
         wsdl = config.getRequiredAttribute("wsdl");
         soapAction = config.getRequiredAttribute("SOAPAction");
         endPointName = config.getRequiredAttribute("EndPointName");
-        operationName = config.getAttribute("operationName");
         smooksRequestMapperURL = config.getAttribute("SmooksRequestMapper");
         smooksResponseMapperURL = config.getAttribute("SmooksResponseMapper");
         serviceName = config.getAttribute("serviceName");
@@ -196,17 +195,27 @@
         loggingEnabled = Boolean.parseBoolean(config.getAttribute("LoggingMessages"));
         logger.info("loggingEnabled:" + loggingEnabled);
         
-        if (config.getAttribute("smooks-handler-config") != null) {
+        if (config.getAttribute("smooks-handler-config") != null) 
+        {
             smooksHandler.add(config.getAttribute("smooks-handler-config"));
         }
         
-        if (config.getAttribute("custom-handlers") != null) {
-            for (String className : config.getAttribute("custom-handlers").split(";")) {
+        if (config.getAttribute("custom-handlers") != null) 
+        {
+            for (String className : config.getAttribute("custom-handlers").split(";")) 
+            {
                 customHandlers.add(className);
             }
 
         }
+        operationName = config.getAttribute("operationName");
         
+        if (operationName == null)
+        {
+            operationName = soapAction;
+            
+        }
+        
         payloadProxy = new MessagePayloadProxy(config);
         
         logger.info(this);

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/wise/SOAPClientUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/wise/SOAPClientUnitTest.java	2009-01-23 18:10:31 UTC (rev 24896)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/wise/SOAPClientUnitTest.java	2009-01-23 18:30:15 UTC (rev 24897)
@@ -67,9 +67,20 @@
     }
     
     @Test
+    public void configNoOperationName() throws ConfigurationException, ActionProcessingException, ActionLifecycleException
+    {
+        final String operationName = null;
+        final ConfigTree config = createConfig(operationName);
+        final SOAPClient client = new MockSOAPClient(config);
+        
+        assertNotNull(client.getOperationName());
+        assertEquals(soapAction, client.getOperationName());
+    }
+    
+    @Test
     public void configOperationName() throws ConfigurationException, ActionProcessingException, ActionLifecycleException
     {
-        final String operationName = "sayHello";
+        final String operationName = "someOperation";
         final ConfigTree config = createConfig(operationName);
         final SOAPClient client = new MockSOAPClient(config);