[jboss-svn-commits] JBL Code SVN: r25012 - 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: kevin.conner at jboss.com
Date: 2009-01-30 06:37:58 -0500 (Fri, 30 Jan 2009)
New Revision: 25012

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:
Make SOAPAction optional: JBESB-2319

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-30 09:57:18 UTC (rev 25011)
+++ 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-30 11:37:58 UTC (rev 25012)
@@ -177,7 +177,7 @@
     public SOAPClient(final ConfigTree config ) throws ConfigurationException 
     {
         wsdl = config.getRequiredAttribute("wsdl");
-        soapAction = config.getRequiredAttribute("SOAPAction");
+        soapAction = config.getAttribute("SOAPAction");
         endPointName = config.getRequiredAttribute("EndPointName");
         smooksRequestMapperURL = config.getAttribute("SmooksRequestMapper");
         smooksRequestMapper = createSmooksMapper(smooksRequestMapperURL) ;
@@ -248,7 +248,7 @@
         } 
         catch (final WiseException e) 
         {
-            throw new ActionProcessingException("Could not call method" + this.soapAction, e);
+            throw new ActionProcessingException("Could not call method" + operationName, e);
         }
         return mapResponseToMessage(message, result, smooksResponseMapper);
     }

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-30 09:57:18 UTC (rev 25011)
+++ 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-30 11:37:58 UTC (rev 25012)
@@ -98,6 +98,17 @@
         assertEquals(operationName, client.getOperationName());
     }
     
+    @Test
+    public void configNoSoapAction() throws ConfigurationException, ActionProcessingException, ActionLifecycleException
+    {
+        final String operationName = "someOperation";
+        final ConfigTree config = createConfig(operationName, null);
+        final SOAPClient client = new MockSOAPClient(config);
+        
+        assertNotNull(client.getOperationName());
+        assertEquals(operationName, client.getOperationName());
+    }
+    
     public static junit.framework.Test suite()
     {
         return new JUnit4TestAdapter(SOAPClientUnitTest.class);