QPID-1652 : Created MessagePublishInfoImpl and Unit Test, removed the several annoynmous classes that did all the same work.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742496 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 170 insertions, 501 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 743a736884..f23983641b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
@@ -29,6 +29,7 @@ import org.apache.qpid.server.queue.QueueRegistry;
 
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.MessageHandleFactory;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.AMQException;
@@ -1148,34 +1149,7 @@ public class DerbyMessageStore implements MessageStore
                 final AMQShortString routingKey = rs.getString(2) == null ? null : new AMQShortString(rs.getString(2));
                 final boolean mandatory = (rs.getShort(3) != (short)0);
                 final boolean immediate = (rs.getShort(4) != (short)0);
-                MessagePublishInfo info = new MessagePublishInfo()
-                                            {
-
-                                                public AMQShortString getExchange()
-                                                {
-                                                    return exchange;
-                                                }
-
-                                                public void setExchange(AMQShortString exchange)
-                                                {
-
-                                                }
-
-                                                public boolean isImmediate()
-                                                {
-                                                    return immediate;
-                                                }
-
-                                                public boolean isMandatory()
-                                                {
-                                                    return mandatory;
-                                                }
-
-                                                public AMQShortString getRoutingKey()
-                                                {
-                                                    return routingKey;
-                                                }
-                                            }   ;
+                MessagePublishInfo info = new MessagePublishInfoImpl(exchange,immediate,mandatory,routingKey);
 
                 Blob dataAsBlob = rs.getBlob(5);
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
index aa7cbbdf3c..a705c8bbb4 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -33,6 +33,7 @@ import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.queue.AMQMessageHandle;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.store.TestMemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.MemoryMessageStore;
@@ -125,34 +126,7 @@ public class TxAckTest extends TestCase
             {
                 long deliveryTag = i + 1;
 
-                MessagePublishInfo info = new MessagePublishInfo()
-                {
-
-                    public AMQShortString getExchange()
-                    {
-                        return null;
-                    }
-
-                    public void setExchange(AMQShortString exchange)
-                    {
-                        //To change body of implemented methods use File | Settings | File Templates.
-                    }
-
-                    public boolean isImmediate()
-                    {
-                        return false;
-                    }
-
-                    public boolean isMandatory()
-                    {
-                        return false;
-                    }
-
-                    public AMQShortString getRoutingKey()
-                    {
-                        return null;
-                    }
-                };
+                MessagePublishInfo info = new MessagePublishInfoImpl();
 
                 TestMessage message = new TestMessage(deliveryTag, i, info, txnContext.getStoreContext());
                 _map.add(deliveryTag, _queue.enqueue(new StoreContext(), message));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 12fa4ef952..883a712bef 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.queue.*;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.MessageStore;
@@ -154,70 +155,6 @@ public class AbstractHeadersExchangeTestBase extends TestCase
         return headers;
     }
 
-
-    static final class MessagePublishInfoImpl implements MessagePublishInfo
-    {
-        private AMQShortString _exchange;
-        private boolean _immediate;
-        private boolean _mandatory;
-        private AMQShortString _routingKey;
-
-        public MessagePublishInfoImpl(AMQShortString routingKey)
-        {
-            _routingKey = routingKey;
-        }
-
-        public MessagePublishInfoImpl(AMQShortString exchange, boolean immediate, boolean mandatory, AMQShortString routingKey)
-        {
-            _exchange = exchange;
-            _immediate = immediate;
-            _mandatory = mandatory;
-            _routingKey = routingKey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return _exchange;
-        }
-
-        public boolean isImmediate()
-        {
-            return _immediate;
-
-        }
-
-        public boolean isMandatory()
-        {
-            return _mandatory;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingKey;
-        }
-
-
-        public void setExchange(AMQShortString exchange)
-        {
-            _exchange = exchange;
-        }
-
-        public void setImmediate(boolean immediate)
-        {
-            _immediate = immediate;
-        }
-
-        public void setMandatory(boolean mandatory)
-        {
-            _mandatory = mandatory;
-        }
-
-        public void setRoutingKey(AMQShortString routingKey)
-        {
-            _routingKey = routingKey;
-        }
-    }
-
     static MessagePublishInfo getPublishRequest(final String id)
     {
         return new MessagePublishInfoImpl(null, false, false, new AMQShortString(id));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
index aa25e207a9..d1a69c9d3c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
@@ -36,6 +36,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 
 import java.util.LinkedList;
 
@@ -72,7 +73,7 @@ public class DestWildExchangeTest extends TestCase
         _exchange.registerQueue(new AMQShortString("a.*.#.b"), queue, null);
 
 
-        MessagePublishInfo info = new PublishInfo(new AMQShortString("a.b"));
+        MessagePublishInfo info = new MessagePublishInfoImpl(null, false, false, new AMQShortString("a.b"));
 
         IncomingMessage message = new IncomingMessage(0L, info, null, _protocolSession);
 
@@ -544,7 +545,7 @@ public class DestWildExchangeTest extends TestCase
 
     private IncomingMessage createMessage(String s) throws AMQException
     {
-        MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
+        MessagePublishInfo info = new MessagePublishInfoImpl(null, false, true, new AMQShortString(s));
 
         TransactionalContext trancontext = new NonTransactionalContext(_store, _context, null,
                                                                        new LinkedList<RequiredDeliveryException>()
@@ -556,40 +557,4 @@ public class DestWildExchangeTest extends TestCase
 
         return message;
     }
-
-
-    class PublishInfo implements MessagePublishInfo
-    {
-        AMQShortString _routingkey;
-
-        PublishInfo(AMQShortString routingkey)
-        {
-            _routingkey = routingkey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return null;
-        }
-
-        public void setExchange(AMQShortString exchange)
-        {
-                        
-        }
-
-        public boolean isImmediate()
-        {
-            return false;
-        }
-
-        public boolean isMandatory()
-        {
-            return true;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingkey;
-        }
-    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index fd11ddeae2..5843e280fa 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -24,6 +24,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.util.NullApplicationRegistry;
 import org.apache.qpid.framing.BasicPublishBody;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 
 public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
 {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index 0ada9cefee..af6bc0e5ab 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -40,6 +40,7 @@ import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.mina.common.ByteBuffer;
 
@@ -47,7 +48,6 @@ import javax.management.Notification;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.Collections;
 import java.util.Set;
 
 /** This class tests all the alerts an AMQQueue can throw based on threshold values of different parameters */
@@ -275,34 +275,7 @@ public class AMQQueueAlertTest extends TestCase
     
     protected IncomingMessage message(final boolean immediate, long size) throws AMQException
     {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
+        MessagePublishInfo publish = new MessagePublishInfoImpl(null,immediate,false,null);
 
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         contentHeaderBody.bodySize = size;   // in bytes
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index eab8ad3e2e..38f030f670 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.subscription.Subscription;
@@ -50,7 +51,6 @@ import javax.management.JMException;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.Collections;
 
 /**
  * Test class to test AMQQueueMBean attribtues and operations
@@ -258,34 +258,7 @@ public class AMQQueueMBeanTest extends TestCase
 
     private IncomingMessage message(final boolean immediate, boolean persistent) throws AMQException
     {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
+        MessagePublishInfo publish = new MessagePublishInfoImpl(null,immediate,false,null);
 
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         contentHeaderBody.bodySize = MESSAGE_SIZE;   // in bytes
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 9c2932c5e2..01674c5b3d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.subscription.Subscription;
@@ -44,7 +45,6 @@ import org.apache.qpid.server.util.NullApplicationRegistry;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.Set;
-import java.util.Collections;
 
 /**
  * Tests that acknowledgements are handled correctly.
@@ -103,34 +103,9 @@ public class AckTest extends TestCase
         {
             // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
             // TODO: Establish some way to determine the version for the test.
-            MessagePublishInfo publishBody = new MessagePublishInfo()
-            {
+            MessagePublishInfo publishBody = new MessagePublishInfoImpl(new AMQShortString("someExchange"), false,
+                                                                        false, new AMQShortString("rk"));
 
-                public AMQShortString getExchange()
-                {
-                    return new AMQShortString("someExchange");
-                }
-
-                public void setExchange(AMQShortString exchange)
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
-                public boolean isImmediate()
-                {
-                    return false;
-                }
-
-                public boolean isMandatory()
-                {
-                    return false;
-                }
-
-                public AMQShortString getRoutingKey()
-                {
-                    return new AMQShortString("rk");
-                }
-            };
             IncomingMessage msg = new IncomingMessage(_messageStore.getNewMessageId(), publishBody, txnContext,_protocolSession);
             //IncomingMessage msg2 = null;
             if (persistent)
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
index 355ba6a362..a05eb0892b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 
 public class MockAMQMessage extends AMQMessage
 {
@@ -31,7 +32,7 @@ public class MockAMQMessage extends AMQMessage
     {
        super(new MockAMQMessageHandle(messageId) ,
                 (StoreContext)null,
-                (MessagePublishInfo)new MockMessagePublishInfo());
+                (MessagePublishInfo)new MessagePublishInfoImpl());
     }
 
     protected MockAMQMessage(AMQMessage msg)
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 7a60ed9795..500655c07c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -30,18 +30,15 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.ContentHeaderProperties;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.subscription.MockSubscription;
 import org.apache.qpid.server.subscription.Subscription;
-import org.apache.qpid.server.subscription.SubscriptionImpl;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
@@ -58,34 +55,7 @@ public class SimpleAMQQueueTest extends TestCase
     protected MockSubscription _subscription = new MockSubscription();
     protected FieldTable _arguments = null;
     
-    MessagePublishInfo info = new MessagePublishInfo()
-    {
-
-        public AMQShortString getExchange()
-        {
-            return null;
-        }
-
-        public void setExchange(AMQShortString exchange)
-        {
-            //To change body of implemented methods use File | Settings | File Templates.
-        }
-
-        public boolean isImmediate()
-        {
-            return false;
-        }
-
-        public boolean isMandatory()
-        {
-            return false;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return null;
-        }
-    };
+    MessagePublishInfo info = new MessagePublishInfoImpl();
     
     @Override
     protected void setUp() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index dec4de4cc6..12ed928e7f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -35,6 +35,7 @@ import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.queue.ExchangeBinding;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -340,7 +341,7 @@ public class MessageStoreTest extends TestCase
         headers.setString("Test", "MST");
         properties.setHeaders(headers);
 
-        MessagePublishInfo messageInfo = new TestMessagePublishInfo(directExchange, false, false, routingKey);
+        MessagePublishInfo messageInfo = new MessagePublishInfoImpl(directExchange.getName(), false, false, routingKey);
 
         IncomingMessage currentMessage = null;
 
@@ -599,46 +600,4 @@ public class MessageStoreTest extends TestCase
 
         assertEquals("Incorrect Message count on queue:" + queueName, messageCount, queue.getMessageCount());
     }
-
-    private class TestMessagePublishInfo implements MessagePublishInfo
-    {
-
-        Exchange _exchange;
-        boolean _immediate;
-        boolean _mandatory;
-        AMQShortString _routingKey;
-
-        TestMessagePublishInfo(Exchange exchange, boolean immediate, boolean mandatory, AMQShortString routingKey)
-        {
-            _exchange = exchange;
-            _immediate = immediate;
-            _mandatory = mandatory;
-            _routingKey = routingKey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return _exchange.getName();
-        }
-
-        public void setExchange(AMQShortString exchange)
-        {
-            //no-op
-        }
-
-        public boolean isImmediate()
-        {
-            return _immediate;
-        }
-
-        public boolean isMandatory()
-        {
-            return _mandatory;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingKey;
-        }
-    }
 }
\ No newline at end of file
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
index 2346660d25..51820f72dd 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -24,8 +24,8 @@ import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.MessageHandleFactory;
 import org.apache.qpid.server.queue.AMQMessageHandle;
@@ -53,35 +53,7 @@ public class TestReferenceCounting extends TestCase
     {
         ContentHeaderBody chb = createPersistentContentHeader();
 
-        MessagePublishInfo info = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
+        MessagePublishInfo info = new MessagePublishInfoImpl();
 
         final long messageId = _store.getNewMessageId();
         AMQMessageHandle messageHandle = (new MessageHandleFactory()).createMessageHandle(messageId, _store, true);
@@ -112,34 +84,7 @@ public class TestReferenceCounting extends TestCase
     public void testMessageRemains() throws AMQException
     {
 
-        MessagePublishInfo info = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
+        MessagePublishInfo info = new MessagePublishInfoImpl();
 
         final Long messageId = _store.getNewMessageId();
         final ContentHeaderBody chb = createPersistentContentHeader();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 509ea817fd..9e24f13127 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -25,6 +25,7 @@ import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.AMQChannel;
@@ -141,33 +142,8 @@ public class InternalBrokerBaseCase extends TestCase
 
     public void publishMessages(InternalTestProtocolSession session, AMQChannel channel, int messages) throws AMQException
     {
-        MessagePublishInfo info = new MessagePublishInfo()
-        {
-            public AMQShortString getExchange()
-            {
-                return ExchangeDefaults.DEFAULT_EXCHANGE_NAME;
-            }
-
-            public void setExchange(AMQShortString exchange)
-            {
-
-            }
-
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return QUEUE_NAME;
-            }
-        };
+        MessagePublishInfo info = new MessagePublishInfoImpl(ExchangeDefaults.DEFAULT_EXCHANGE_NAME, false, false,
+                                                             QUEUE_NAME);
 
         for (int count = 0; count < messages; count++)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
index 5a5ffaa14d..e3d5da73da 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
@@ -18,35 +18,68 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.queue;
+package org.apache.qpid.framing.abstraction;
 
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.AMQShortString;
 
-public class MockMessagePublishInfo implements MessagePublishInfo
+public class MessagePublishInfoImpl implements MessagePublishInfo
 {
+    private AMQShortString _exchange;
+    private boolean _immediate;
+    private boolean _mandatory;
+    private AMQShortString _routingKey;
+
+    public MessagePublishInfoImpl()
+    {
+    }
+
+    public MessagePublishInfoImpl(AMQShortString exchange, boolean immediate, boolean mandatory,
+                                  AMQShortString routingKey)
+    {
+        _exchange = exchange;
+        _immediate = immediate;
+        _mandatory = mandatory;
+        _routingKey = routingKey;
+    }
+
     public AMQShortString getExchange()
     {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+        return _exchange;
     }
 
     public void setExchange(AMQShortString exchange)
     {
-        //To change body of implemented methods use File | Settings | File Templates.
+        _exchange = exchange;
     }
 
     public boolean isImmediate()
     {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+        return _immediate;
+    }
+
+    public void setImmediate(boolean immedate)
+    {
+        _immediate = immedate;
     }
 
     public boolean isMandatory()
     {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+        return _mandatory;
+    }
+
+    public void setMandatory(boolean mandatory)
+    {
+        _mandatory = mandatory;        
     }
 
     public AMQShortString getRoutingKey()
     {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+        return _routingKey;
+    }
+
+    public void setRoutingKey(AMQShortString routingKey)
+    {
+        _routingKey = routingKey;
     }
 }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index fd5195eb6b..a5c5e5f22d 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
@@ -27,6 +27,7 @@ import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.framing.amqp_0_9.*;
 import org.apache.qpid.framing.amqp_0_9.BasicPublishBodyImpl;
@@ -78,7 +79,7 @@ public class MethodConverter_0_9 extends AbstractMethodConverter implements Prot
         final AMQShortString exchange = publishBody.getExchange();
         final AMQShortString routingKey = publishBody.getRoutingKey();
 
-        return new MethodConverter_0_9.MessagePublishInfoImpl(exchange,
+        return new MessagePublishInfoImpl(exchange,
                                           publishBody.getImmediate(),
                                           publishBody.getMandatory(),
                                           routingKey);
@@ -96,50 +97,6 @@ public class MethodConverter_0_9 extends AbstractMethodConverter implements Prot
 
     }
 
-    private static class MessagePublishInfoImpl implements MessagePublishInfo
-    {
-        private AMQShortString _exchange;
-        private final boolean _immediate;
-        private final boolean _mandatory;
-        private final AMQShortString _routingKey;
-
-        public MessagePublishInfoImpl(final AMQShortString exchange,
-                                      final boolean immediate,
-                                      final boolean mandatory,
-                                      final AMQShortString routingKey)
-        {
-            _exchange = exchange;
-            _immediate = immediate;
-            _mandatory = mandatory;
-            _routingKey = routingKey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return _exchange;
-        }
-
-        public void setExchange(AMQShortString exchange)
-        {
-            _exchange = exchange;
-        }
-
-        public boolean isImmediate()
-        {
-            return _immediate;
-        }
-
-        public boolean isMandatory()
-        {
-            return _mandatory;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingKey;
-        }
-    }
-
     private static class ContentChunk_0_9 implements ContentChunk
     {
         private final ContentBody _contentBodyChunk;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index 299c655698..1b0be2b9cc 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
@@ -25,6 +25,7 @@ import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.framing.amqp_8_0.BasicPublishBodyImpl;
 import org.apache.qpid.framing.*;
 
@@ -104,48 +105,4 @@ public class MethodConverter_8_0 extends AbstractMethodConverter implements Prot
                                     info.isImmediate()) ;
 
     }
-
-    private static class MessagePublishInfoImpl implements MessagePublishInfo
-    {
-        private AMQShortString _exchange;
-        private final boolean _immediate;
-        private final boolean _mandatory;
-        private final AMQShortString _routingKey;
-
-        public MessagePublishInfoImpl(final AMQShortString exchange,
-                                      final boolean immediate,
-                                      final boolean mandatory,
-                                      final AMQShortString routingKey)
-        {
-            _exchange = exchange;
-            _immediate = immediate;
-            _mandatory = mandatory;
-            _routingKey = routingKey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return _exchange;
-        }
-
-        public void setExchange(AMQShortString exchange)
-        {
-            _exchange = exchange;
-        }
-
-        public boolean isImmediate()
-        {
-            return _immediate;
-        }
-
-        public boolean isMandatory()
-        {
-            return _mandatory;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingKey;
-        }
-    }
 }
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
new file mode 100644
index 0000000000..3243136287
--- /dev/null
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
@@ -0,0 +1,99 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.framing.abstraction;
+
+import junit.framework.TestCase;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
+
+public class MessagePublishInfoImplTest extends TestCase
+{
+    MessagePublishInfoImpl _mpi;
+    final AMQShortString _exchange = new AMQShortString("exchange");
+    final AMQShortString _routingKey = new AMQShortString("routingKey");
+
+    public void setUp()
+    {
+        _mpi = new MessagePublishInfoImpl(_exchange, true, true, _routingKey);
+    }
+
+    /** Test that we can update the exchange value. */
+    public void testExchange()
+    {
+        assertEquals(_exchange, _mpi.getExchange());
+        AMQShortString newExchange = new AMQShortString("newExchange");
+        //Check we can update the exchange
+        _mpi.setExchange(newExchange);
+        assertEquals(newExchange, _mpi.getExchange());
+        //Ensure that the new exchange doesn't equal the old one
+        assertFalse(_exchange.equals(_mpi.getExchange()));
+    }
+
+    /**
+     * Check that the immedate value is set correctly and defaulted correctly
+     */
+    public void testIsImmediate()
+    {
+        //Check that the set value is correct
+        assertTrue("Set value for immediate not as expected", _mpi.isImmediate());
+
+        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+
+        assertFalse("Default value for immediate should be false", mpi.isImmediate());
+
+        mpi.setImmediate(true);
+        
+        assertTrue("Updated value for immediate not as expected", mpi.isImmediate());
+
+    }
+
+    /**
+     * Check that the mandatory value is set correctly and defaulted correctly
+     */
+    public void testIsMandatory()
+    {
+        assertTrue("Set value for mandatory not as expected", _mpi.isMandatory());
+
+        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+
+        assertFalse("Default value for mandatory should be false", mpi.isMandatory());
+
+        mpi.setMandatory(true);
+
+        assertTrue("Updated value for mandatory not as expected", mpi.isMandatory());
+    }
+
+    /**
+     * Check that the routingKey value is perserved
+     */
+    public void testRoutingKey()
+    {
+        assertEquals(_routingKey, _mpi.getRoutingKey());
+        AMQShortString newRoutingKey = new AMQShortString("newRoutingKey");
+
+        //Check we can update the routingKey
+        _mpi.setRoutingKey(newRoutingKey);
+        assertEquals(newRoutingKey, _mpi.getRoutingKey());
+        //Ensure that the new routingKey doesn't equal the old one
+        assertFalse(_routingKey.equals(_mpi.getRoutingKey()));
+
+    }
+}