[jboss-svn-commits] JBL Code SVN: r15405 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/notification/jms and 1 other directory.

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

Author: beve
Date: 2007-09-27 09:01:39 -0400 (Thu, 27 Sep 2007)
New Revision: 15405

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetter.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java
Log:
Work for JBESB-1095 "make DefaultJMSPropertiesSetter set the JMSCorrelationID"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetter.java	2007-09-27 12:36:53 UTC (rev 15404)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetter.java	2007-09-27 13:01:39 UTC (rev 15405)
@@ -22,6 +22,7 @@
 package org.jboss.soa.esb.notification.jms;
 
 import java.net.URI;
+
 import javax.jms.JMSException;
 import javax.jms.Message;
 
@@ -70,10 +71,21 @@
 	public void setJMSProperties( final org.jboss.soa.esb.message.Message fromESBMessage , final Message toJMSMessage ) throws JMSException 
 	{ 	
 		setJMSMessageID( fromESBMessage, toJMSMessage );
+		setJMSCorrelationID( fromESBMessage,toJMSMessage );
 		setJMSExpiration( fromESBMessage,toJMSMessage );
 		setProperties( fromESBMessage, toJMSMessage );
 	}
 	
+	private void setJMSCorrelationID( final org.jboss.soa.esb.message.Message fromESBMessage , final Message toJMSMessage ) throws JMSException 
+	{ 	
+		final URI correlationID = fromESBMessage.getHeader().getCall().getRelatesTo();
+		if ( correlationID != null )
+		{
+			log.debug( "Setting outgoing JMSCorreletionID to : " + correlationID.getFragment() );
+	        toJMSMessage.setJMSCorrelationID( correlationID.getFragment() );
+		}
+	}
+	
 	private void setJMSMessageID( final org.jboss.soa.esb.message.Message fromESBMessage , final Message toJMSMessage ) throws JMSException 
 	{ 	
 		final URI messageID = fromESBMessage.getHeader().getCall().getMessageID();

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java	2007-09-27 12:36:53 UTC (rev 15404)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/notification/jms/DefaultJMSPropertiesSetterUnitTest.java	2007-09-27 13:01:39 UTC (rev 15405)
@@ -33,6 +33,7 @@
 import junit.framework.JUnit4TestAdapter;
 
 import org.apache.log4j.Logger;
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.format.MessageFactory;
 import org.junit.Before;
@@ -75,6 +76,18 @@
 	}
 	
 	@Test
+	public void setJMSProperties_with_custom_correlationID() throws JMSException, URISyntaxException
+	{
+		final String expectedCorrelationID = "testCorrelationID22333";
+		final URI correlationURI = new URI( JMSEpr.JMS_PROTOCOL, "correlationID" , expectedCorrelationID  );
+		fromESBMessage.getHeader().getCall().setRelatesTo( correlationURI );
+		
+		strategy.setJMSProperties( fromESBMessage, toJMSMessage );
+		
+		assertEquals ( expectedCorrelationID,  toJMSMessage.getJMSCorrelationID() );
+	}
+	
+	@Test
 	public void setJMSProperties_with_set_expiration() throws JMSException, URISyntaxException
 	{
 		long expire = 1883l;