[jboss-svn-commits] JBL Code SVN: r35327 - in labs/jbossesb/branches/JBESB_4_9_CP/product: rosetta/tests/src/org/jboss/soa/esb/actions/cbr/regex and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 28 03:51:56 EDT 2010
Author: tfennelly
Date: 2010-09-28 03:51:55 -0400 (Tue, 28 Sep 2010)
New Revision: 35327
Modified:
labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/src/org/jboss/soa/esb/actions/cbr/AbstractPropertyRulesRouter.java
labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/regex/RegexRouterUnitTest.java
labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/sxc/SxcXPathRouterUnitTest.java
labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/xpath/XPathRouterUnitTest.java
labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/fun_cbr/SampleOrder.xml
Log:
https://jira.jboss.org/browse/JBESB-3389
CBR: an object path is converted to a real object twice
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/src/org/jboss/soa/esb/actions/cbr/AbstractPropertyRulesRouter.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/src/org/jboss/soa/esb/actions/cbr/AbstractPropertyRulesRouter.java 2010-09-28 06:41:12 UTC (rev 35326)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/src/org/jboss/soa/esb/actions/cbr/AbstractPropertyRulesRouter.java 2010-09-28 07:51:55 UTC (rev 35327)
@@ -153,35 +153,16 @@
}
private List<Object> getMessageObjectsToTest(Message message, List<Object> objectList) throws MessageRouterException {
- List<Object> objectsToTest = new ArrayList<Object>();
-
if(objectList == null || objectList.isEmpty()) {
+ List<Object> objectsToTest = new ArrayList<Object>();
try {
objectsToTest.add(payloadProxy.getPayload(message));
+ return objectsToTest;
} catch (MessageDeliverException e) {
throw new MessageRouterException("Failed to get message payload from message.", e);
}
} else {
- ObjectMapper objectMapper = new ObjectMapper();
-
- for(Object object : objectList) {
- if(object instanceof String) {
- try {
- Object mappedObject = objectMapper.getObjectFromMessage(message, (String) object);
-
- if(mappedObject == null) {
- logger.debug("Object '" + object + "' not present on message.");
- continue;
- }
-
- objectsToTest.add(mappedObject);
- } catch (ObjectMappingException e) {
- logger.debug("Object '" + object + "' not present on message.");
- }
- }
- }
+ return objectList;
}
-
- return objectsToTest;
}
}
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/regex/RegexRouterUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/regex/RegexRouterUnitTest.java 2010-09-28 06:41:12 UTC (rev 35326)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/regex/RegexRouterUnitTest.java 2010-09-28 07:51:55 UTC (rev 35327)
@@ -88,8 +88,7 @@
message.getBody().add("x", "<x/>");
message.getBody().add("y", GREEN_MESSAGE);
- test_routing(message, Arrays.asList("y"));
- test_routing(message, Arrays.asList("body.y"));
+ test_routing(message, Arrays.asList(GREEN_MESSAGE));
}
public void test_routing(Message message, List objectLists) throws IOException, SAXException, ConfigurationException, MessageRouterException {
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/sxc/SxcXPathRouterUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/sxc/SxcXPathRouterUnitTest.java 2010-09-28 06:41:12 UTC (rev 35326)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/sxc/SxcXPathRouterUnitTest.java 2010-09-28 07:51:55 UTC (rev 35327)
@@ -121,8 +121,7 @@
message.getBody().add("x", "<x/>");
message.getBody().add("y", GREEN_MESSAGE);
- test_routing(message, Arrays.asList("y"));
- test_routing(message, Arrays.asList("body.y"));
+ test_routing(message, Arrays.asList(GREEN_MESSAGE));
}
public void test_routing(Message message, List objectLists) throws IOException, SAXException, ConfigurationException, MessageRouterException {
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/xpath/XPathRouterUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/xpath/XPathRouterUnitTest.java 2010-09-28 06:41:12 UTC (rev 35326)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/rosetta/tests/src/org/jboss/soa/esb/actions/cbr/xpath/XPathRouterUnitTest.java 2010-09-28 07:51:55 UTC (rev 35327)
@@ -119,10 +119,7 @@
public void test_routing_ObjectList() throws IOException, SAXException, ConfigurationException, MessageRouterException {
Message message = MessageFactory.getInstance().getMessage();
- message.getBody().add("x", "<x/>");
- message.getBody().add("y", GREEN_MESSAGE);
- test_routing(message, Arrays.asList("y"));
- test_routing(message, Arrays.asList("body.y"));
+ test_routing(message, Arrays.asList(GREEN_MESSAGE));
}
public void test_routing(Message message, List objectLists) throws IOException, SAXException, ConfigurationException, MessageRouterException {
Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/fun_cbr/SampleOrder.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/fun_cbr/SampleOrder.xml 2010-09-28 06:41:12 UTC (rev 35326)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/fun_cbr/SampleOrder.xml 2010-09-28 07:51:55 UTC (rev 35327)
@@ -1,4 +1,4 @@
-<Order xmlns="http://org.jboss.soa.esb/Order" orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="0"
+<Order xmlns="http://org.jboss.soa.esb/Order" orderId="1" orderDate="Wed Nov 15 13:45:28 EST 2006" statusCode="2"
netAmount="59.97" totalAmount="64.92" tax="4.95">
<Customer userName="user1" firstName="Harry" lastName="Fletcher" state="SD"/>
<OrderLines>
More information about the jboss-svn-commits
mailing list