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/qpid@742496 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 187 insertions, 89 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java b/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
new file mode 100644
index 0000000000..e3d5da73da
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
@@ -0,0 +1,85 @@
+/*
+ *
+ * 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 org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.AMQShortString;
+
+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 _exchange;
+    }
+
+    public void setExchange(AMQShortString exchange)
+    {
+        _exchange = exchange;
+    }
+
+    public boolean isImmediate()
+    {
+        return _immediate;
+    }
+
+    public void setImmediate(boolean immedate)
+    {
+        _immediate = immedate;
+    }
+
+    public boolean isMandatory()
+    {
+        return _mandatory;
+    }
+
+    public void setMandatory(boolean mandatory)
+    {
+        _mandatory = mandatory;        
+    }
+
+    public AMQShortString getRoutingKey()
+    {
+        return _routingKey;
+    }
+
+    public void setRoutingKey(AMQShortString routingKey)
+    {
+        _routingKey = routingKey;
+    }
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index fd5195eb6b..a5c5e5f22d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
+++ b/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/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index 299c655698..1b0be2b9cc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
+++ b/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/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
new file mode 100644
index 0000000000..3243136287
--- /dev/null
+++ b/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()));
+
+    }
+}