[jboss-svn-commits] JBL Code SVN: r17558 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter.

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

Author: kevin.conner at jboss.com
Date: 2008-01-04 12:29:47 -0500 (Fri, 04 Jan 2008)
New Revision: 17558

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
Log:
Fix deadletter body comparison: JBESB-1442

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java	2008-01-04 16:55:16 UTC (rev 17557)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java	2008-01-04 17:29:47 UTC (rev 17558)
@@ -21,6 +21,7 @@
 package org.jboss.soa.esb.samples.quickstart.deadletter;
 
 import java.net.URI;
+import java.util.Date;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -31,6 +32,7 @@
 import org.jboss.soa.esb.client.ServiceInvoker;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.persistence.MessageStore;
 import org.jboss.soa.esb.services.persistence.MessageStoreException;
@@ -44,6 +46,9 @@
     protected ConfigTree _config;
     private Logger logger = Logger.getLogger(this.getClass());
 
+    private static final String ID = "ASYNC-ID" ;
+    private static final String DATE = "ASYNC-DATE" ;
+
     public MyFailingAsyncAction(ConfigTree config) {
         _config = config;
     }
@@ -63,6 +68,8 @@
         MessageStore ms = MessageStoreFactory.getInstance().getMessageStore();
         Message rdlvrMessage = null;       
  
+        message.getBody().add(ID, "ID:" + Integer.toHexString(System.identityHashCode(message))) ;
+        message.getBody().add(DATE, new Date()) ;
         try {
             //empty out the DLQ
             Map<URI, Message> messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
@@ -87,7 +94,7 @@
             for (URI key : rdlvrMessageMap.keySet()) {
                 rdlvrMessage = rdlvrMessageMap.get(key);
                 logger.info("*******************************");
-                logger.info("Message in the RDLVR should be the same message: " + message.getBody().toString().equals(rdlvrMessage.getBody().toString()));
+                logger.info("Message in the RDLVR should be the same message: " + compare(message.getBody(), rdlvrMessage.getBody()));
                 logger.info("Message=" + message.getBody());
                 logger.info("rdlvrMessage=" + rdlvrMessage.getBody());
                 logger.info("*******************************");
@@ -102,5 +109,18 @@
         return rdlvrMessage;
 
     }
+    
+    private static boolean compare(final Body lhs, final Body rhs)
+    {
+        return compare(ID, lhs, rhs) && compare(DATE, lhs, rhs) ;
+    }
+    
+    private static boolean compare(final String name, final Body lhs, final Body rhs)
+    {
+        final Object lhsObject = lhs.get(name) ;
+        final Object rhsObject = rhs.get(name) ;
+        
+        return ((lhsObject != null) && lhsObject.equals(rhsObject)) ;
+    }
 
 }

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java	2008-01-04 16:55:16 UTC (rev 17557)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java	2008-01-04 17:29:47 UTC (rev 17558)
@@ -21,6 +21,7 @@
 package org.jboss.soa.esb.samples.quickstart.deadletter;
 
 import java.net.URI;
+import java.util.Date;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -32,6 +33,7 @@
 import org.jboss.soa.esb.couriers.FaultMessageException;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Body;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.persistence.MessageStore;
 import org.jboss.soa.esb.services.persistence.MessageStoreException;
@@ -45,6 +47,9 @@
 
     protected ConfigTree _config;
     private Logger logger = Logger.getLogger(this.getClass());
+    
+    private static final String ID = "SYNC-ID" ;
+    private static final String DATE = "SYNC-DATE" ;
 
     public MyFailingSyncAction(ConfigTree config) {
         _config = config;
@@ -64,6 +69,8 @@
         //MessageStore under the DLQ categorization.
         MessageStore ms = MessageStoreFactory.getInstance().getMessageStore();
        	Message dlqMessage = null; 
+       	message.getBody().add(ID, "ID:" + Integer.toHexString(System.identityHashCode(message))) ;
+        message.getBody().add(DATE, new Date()) ;
         try {
             //empty out the DLQ
             Map<URI, Message> messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_DLQ);
@@ -92,7 +99,7 @@
                 for (URI key : messageMap.keySet()) {
                     dlqMessage = messageMap.get(key);
                     logger.info("*******************************");
-                    logger.info("Message in the DLQ queue should be the same message: " + message.getBody().toString().equals(dlqMessage.getBody().toString()));
+                    logger.info("Message in the DLQ queue should be the same message: " + compare(message.getBody(), dlqMessage.getBody()));
                     logger.info("Message=" + message.getBody());
                     logger.info("dlqMessage=" + dlqMessage.getBody());
                     logger.info("*******************************");
@@ -108,5 +115,17 @@
         return dlqMessage;
 
     }
-
+    
+    private static boolean compare(final Body lhs, final Body rhs)
+    {
+        return compare(ID, lhs, rhs) && compare(DATE, lhs, rhs) ;
+    }
+    
+    private static boolean compare(final String name, final Body lhs, final Body rhs)
+    {
+        final Object lhsObject = lhs.get(name) ;
+        final Object rhsObject = rhs.get(name) ;
+        
+        return ((lhsObject != null) && lhsObject.equals(rhsObject)) ;
+    }
 }