Fix for fmtn#22 - JS transformer not working with copy/move during all conditions

Author: northlander

src/main/java/co/nordlander/a/A.java

@@ -242,7 +242,7 @@ protected void executeCommandLine(CommandLine cmdLine) throws Exception{
 	}
 
 	protected void executeMove(CommandLine cmdLine) throws JMSException,
-			UnsupportedEncodingException, IOException {
+			UnsupportedEncodingException, ScriptException, IOException {
 
 		// Should be able to support some kind of Move operation even though the session is not transacted.
 		boolean hasTransactionalSession = tsess != null;
@@ -266,7 +266,7 @@ protected void executeMove(CommandLine cmdLine) throws JMSException,
 			if (msg == null) {
 				break;
 			} else {
-				mp.send(msg);
+				sendWithOptionalTransformer(cmdLine, msg, mp);
 				if( hasTransactionalSession ){
 					moveSession.commit();
 				}
@@ -303,17 +303,12 @@ protected void executeCopy(CommandLine cmdLine) throws JMSException, ScriptExcep
 						String haystack = ((TextMessage) msg).getText();
 						String needle = cmdLine.getOptionValue(CMD_FIND);
 						if (haystack != null && haystack.contains(needle)) {
-							if( cmdLine.hasOption(CMD_TRANSFORM_SCRIPT) ) {
-								mp.send(transformMessage(msg,cmdLine.getOptionValue(CMD_TRANSFORM_SCRIPT)));
-							} else {
-								mp.send(msg);
-							}
-							
+							sendWithOptionalTransformer(cmdLine, msg, mp);
 							++j;
 						}
 					}
 				} else {
-					mp.send(msg);
+					sendWithOptionalTransformer(cmdLine, msg, mp);
 					++j;
 				}
 				++i;
@@ -323,6 +318,15 @@ protected void executeCopy(CommandLine cmdLine) throws JMSException, ScriptExcep
 				" to ", cmdLine.getArgs()[0]);
 	}
 
+	protected void sendWithOptionalTransformer(CommandLine cmdLine, Message msg, MessageProducer mp) throws JMSException, ScriptException, IOException {
+		if( cmdLine.hasOption(CMD_TRANSFORM_SCRIPT) ) {
+			mp.send(transformMessage(msg, cmdLine.getOptionValue(CMD_TRANSFORM_SCRIPT)));
+		} else {
+			mp.send(msg);
+		}
+
+	}
+
 	protected void connect(String url, String user, String password,
 			Protocol protocol, String jndi, boolean noTransactionSupport) throws Exception {
 		if (StringUtils.isBlank(jndi)) {

src/test/java/co/nordlander/a/BaseTest.java

@@ -269,6 +269,25 @@ public void testCopyQueue() throws Exception{
         assertNull(msg);
     }
 
+    /**
+     * Test that transforming messages with copy works.
+     * @throws Exception
+     */
+    @Test
+    public void testCopyQueueWithTransformer() throws Exception {
+        final String script = "\"msg.stringProperties.put('changeme','new');\"";
+        final String cmdLine = getConnectCommand() + "-" + CMD_COPY_QUEUE + " SOURCE.QUEUE -" + CMD_TRANSFORM_SCRIPT + " " + script + " TARGET.QUEUE";
+
+        MessageProducer mp = session.createProducer(sourceQueue);
+        mp.send(testMessage);
+        a.run(cmdLine.split(" "));
+        // Verify messages are moved to target queue
+        MessageConsumer mc = session.createConsumer(targetQueue);
+        TextMessage msg = (TextMessage)mc.receive(TEST_TIMEOUT);
+        assertNotNull(msg);
+        assertEquals("new", msg.getStringProperty("changeme"));
+    }
+
     /**
      * Test that all messages are moved from one queue to the other.
      * @throws Exception
@@ -293,6 +312,26 @@ public void testMoveQueue() throws Exception{
         assertNotNull(msg);
         msg = (TextMessage)mc.receive(TEST_TIMEOUT);
         assertNull(msg);
+
+    }
+
+    /**
+     * Test that all messages are moved from one queue to the other.
+     * @throws Exception
+     */
+    @Test
+    public void testMoveQueueWithTransformer() throws Exception{
+        final String script = "\"msg.stringProperties.put('changeme','new');\"";
+        final String cmdLine = getConnectCommand() + "-" + CMD_MOVE_QUEUE + " SOURCE.QUEUE -" + CMD_TRANSFORM_SCRIPT + " " + script + " TARGET.QUEUE";
+        MessageProducer mp = session.createProducer(sourceQueue);
+        mp.send(testMessage);
+        a.run(cmdLine.split(" "));
+        // Verify messages are moved to target queue with changed property
+        MessageConsumer mc = session.createConsumer(targetQueue);
+        TextMessage msg = (TextMessage)mc.receive(TEST_TIMEOUT);
+        assertNotNull(msg);
+        assertEquals("new", msg.getStringProperty("changeme"));
+
     }
 
     /**