QPID-5088 : [Java Broker] Isolate use of AMQShortString and FieldTable to 0-8/9/9-1 protocol specific plugins

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

7 files changed, 52 insertions, 51 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 91f56f369b..69b529cf40 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -30,6 +30,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.url.AMQBindingURL;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index a57eca23bd..f89e33ccc4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -47,7 +47,6 @@ import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.ConflationQueue;
 import org.apache.qpid.server.protocol.v0_8.IncomingMessage;
@@ -97,10 +96,10 @@ public class MessageStoreTest extends QpidTestCase
     private String priorityQueueName = "MST-PriorityQueue";
     private String queueName = "MST-Queue";
 
-    private AMQShortString directRouting = new AMQShortString("MST-direct");
-    private AMQShortString topicRouting = new AMQShortString("MST-topic");
+    private String directRouting = "MST-direct";
+    private String topicRouting = "MST-topic";
 
-    private AMQShortString queueOwner = new AMQShortString("MST");
+    private String queueOwner = "MST";
 
     private PropertiesConfiguration _config;
 
@@ -448,7 +447,7 @@ public class MessageStoreTest extends QpidTestCase
         //create durable queue and exchange, bind them
         Exchange exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
         createQueue(durableQueueName, false, true, false, false);
-        bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false, null);
+        bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false);
 
         assertEquals("Incorrect number of bindings registered before recovery",
                 1, getVirtualHost().getQueue(durableQueueName).getBindings().size());
@@ -463,7 +462,7 @@ public class MessageStoreTest extends QpidTestCase
         assertNotNull("Exchange was not recovered", exch);
 
         //remove the binding and verify result after recovery
-        unbindQueueFromExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false, null);
+        unbindQueueFromExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false);
 
         reloadVirtualHost();
 
@@ -604,7 +603,7 @@ public class MessageStoreTest extends QpidTestCase
         }
     }
 
-    private void sendMessageOnExchange(Exchange exchange, AMQShortString routingKey, boolean deliveryMode)
+    private void sendMessageOnExchange(Exchange exchange, String routingKey, boolean deliveryMode)
     {
         //Set MessagePersistence
         BasicContentHeaderProperties properties = new BasicContentHeaderProperties();
@@ -733,7 +732,7 @@ public class MessageStoreTest extends QpidTestCase
         //Ideally we would be able to use the QueueDeclareHandler here.
         try
         {
-            queue = getVirtualHost().createQueue(UUIDGenerator.generateRandomUUID(), queueName, durable, queueOwner.asString(), false, exclusive,
+            queue = getVirtualHost().createQueue(UUIDGenerator.generateRandomUUID(), queueName, durable, queueOwner, false, exclusive,
                     false, queueArguments);
 
             validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue);
@@ -766,7 +765,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            exchange = getVirtualHost().createExchange(null, name, type.getName().toString(), durable, false, null);
+            exchange = getVirtualHost().createExchange(null, name, type.getType(), durable, false, null);
         }
         catch (AMQException e)
         {
@@ -776,43 +775,40 @@ public class MessageStoreTest extends QpidTestCase
         return exchange;
     }
 
-    private void bindAllQueuesToExchange(Exchange exchange, AMQShortString routingKey)
+    private void bindAllQueuesToExchange(Exchange exchange, String routingKey)
     {
-        FieldTable queueArguments = new FieldTable();
-        queueArguments.put(new AMQShortString(QueueArgumentsConverter.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
-
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false, queueArguments);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false, null);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityQueueName), false, queueArguments);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(queueName), false, null);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityQueueName), false);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(queueName), false);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false);
     }
 
-    private void bindAllTopicQueuesToExchange(Exchange exchange, AMQShortString routingKey)
+    private void bindAllTopicQueuesToExchange(Exchange exchange, String routingKey)
     {
-        FieldTable queueArguments = new FieldTable();
-        queueArguments.put(new AMQShortString(QueueArgumentsConverter.X_QPID_PRIORITIES), DEFAULT_PRIORTY_LEVEL);
 
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true, queueArguments);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableTopicQueueName), true, null);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityTopicQueueName), true, queueArguments);
-        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(topicQueueName), true, null);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableTopicQueueName), true);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(priorityTopicQueueName), true);
+        bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(topicQueueName), true);
     }
 
 
-    protected void bindQueueToExchange(Exchange exchange, AMQShortString routingKey, AMQQueue queue, boolean useSelector, FieldTable queueArguments)
+    protected void bindQueueToExchange(Exchange exchange,
+                                       String routingKey,
+                                       AMQQueue queue,
+                                       boolean useSelector)
     {
-        FieldTable bindArguments = null;
+        Map<String,Object> bindArguments = new HashMap<String, Object>();
 
         if (useSelector)
         {
-            bindArguments = new FieldTable();
-            bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue(), SELECTOR_VALUE );
+            bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.toString(), SELECTOR_VALUE );
         }
 
         try
         {
-            exchange.addBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(bindArguments));
+            exchange.addBinding(routingKey, queue, bindArguments);
         }
         catch (Exception e)
         {
@@ -820,19 +816,21 @@ public class MessageStoreTest extends QpidTestCase
         }
     }
 
-    protected void unbindQueueFromExchange(Exchange exchange, AMQShortString routingKey, AMQQueue queue, boolean useSelector, FieldTable queueArguments)
+    protected void unbindQueueFromExchange(Exchange exchange,
+                                           String routingKey,
+                                           AMQQueue queue,
+                                           boolean useSelector)
     {
-        FieldTable bindArguments = null;
+        Map<String,Object> bindArguments = new HashMap<String, Object>();
 
         if (useSelector)
         {
-            bindArguments = new FieldTable();
-            bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue(), SELECTOR_VALUE );
+            bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.toString(), SELECTOR_VALUE );
         }
 
         try
         {
-            exchange.removeBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(bindArguments));
+            exchange.removeBinding(routingKey, queue, bindArguments);
         }
         catch (Exception e)
         {
@@ -879,9 +877,9 @@ public class MessageStoreTest extends QpidTestCase
         Exchange _exchange;
         boolean _immediate;
         boolean _mandatory;
-        AMQShortString _routingKey;
+        String _routingKey;
 
-        TestMessagePublishInfo(Exchange exchange, boolean immediate, boolean mandatory, AMQShortString routingKey)
+        TestMessagePublishInfo(Exchange exchange, boolean immediate, boolean mandatory, String routingKey)
         {
             _exchange = exchange;
             _immediate = immediate;
@@ -891,7 +889,7 @@ public class MessageStoreTest extends QpidTestCase
 
         public AMQShortString getExchange()
         {
-            return _exchange.getNameShortString();
+            return new AMQShortString(_exchange.getName());
         }
 
         public void setExchange(AMQShortString exchange)
@@ -911,7 +909,7 @@ public class MessageStoreTest extends QpidTestCase
 
         public AMQShortString getRoutingKey()
         {
-            return _routingKey;
+            return new AMQShortString(_routingKey);
         }
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
index cc662bddca..594239b2ee 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
@@ -53,10 +53,10 @@ public class ExchangeManagementTest extends QpidBrokerTestCase
         _managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
         _testQueueName = getTestName();
         _managedBroker.createNewQueue(_testQueueName, null, true);
-        _directExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME.asString());
-        _topicExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME.asString());
-        _fanoutExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.FANOUT_EXCHANGE_NAME.asString());
-        _headersExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.HEADERS_EXCHANGE_NAME.asString());
+        _directExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
+        _topicExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
+        _fanoutExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.FANOUT_EXCHANGE_NAME);
+        _headersExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.HEADERS_EXCHANGE_NAME);
 
         _connection = getConnection();
         _connection.start();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
index 664b8fffa4..da72dd6f05 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
@@ -80,8 +80,8 @@ public class StructureRestTest extends QpidRestTestCase
                 Map<String, Object> exchange = getRestTestHelper().find("name", exchangeName, exchanges);
                 assertNotNull("Exchange " + exchangeName + " is not found ", exchange);
                 assertNode(exchange, exchangeName);
-                if (ExchangeDefaults.DIRECT_EXCHANGE_NAME.asString().equalsIgnoreCase(exchangeName) ||
-                    ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString().equalsIgnoreCase(exchangeName))
+                if (ExchangeDefaults.DIRECT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName) ||
+                    ExchangeDefaults.DEFAULT_EXCHANGE_NAME.equalsIgnoreCase(exchangeName))
                 {
                     @SuppressWarnings("unchecked")
                     List<Map<String, Object>> bindings = (List<Map<String, Object>>) exchange.get("bindings");
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 3c26cbb3c9..2d8847ea33 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -19,6 +19,7 @@
  */
 package org.apache.qpid.test.unit.basic;
 
+import org.apache.qpid.framing.AMQShortString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -190,7 +191,7 @@ public class MultipleConnectionTest extends QpidBrokerTestCase
         String broker = _connectionString;
         int messages = 10;
 
-        AMQTopic topic = new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, "amq.topic");
+        AMQTopic topic = new AMQTopic(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME), "amq.topic");
 
         Receiver[] receivers = new Receiver[] { new Receiver(broker, topic, 2), new Receiver(broker, topic, 14) };
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 67b2e099bf..963a23b0ba 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -88,16 +88,16 @@ public class ConnectionTest extends QpidBrokerTestCase
             AMQSession sess = (AMQSession) conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             sess.declareExchange(new AMQShortString("test.direct"),
-                    ExchangeDefaults.DIRECT_EXCHANGE_CLASS, false);
+                    AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), false);
 
             sess.declareExchange(new AMQShortString("tmp.direct"),
-                    ExchangeDefaults.DIRECT_EXCHANGE_CLASS, false);
+                    AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), false);
 
             sess.declareExchange(new AMQShortString("tmp.topic"),
-                    ExchangeDefaults.TOPIC_EXCHANGE_CLASS, false);
+                    AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS), false);
 
             sess.declareExchange(new AMQShortString("test.topic"),
-                    ExchangeDefaults.TOPIC_EXCHANGE_CLASS, false);
+                    AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS), false);
 
             QueueSession queueSession = conn.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 3828cd8ea0..38a7b90ebd 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -57,6 +57,7 @@ import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.server.Broker;
@@ -1190,7 +1191,7 @@ public class QpidBrokerTestCase extends QpidTestCase
      */
     public Topic getTestTopic()
     {
-        return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, getTestQueueName());
+        return new AMQTopic(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME), getTestQueueName());
     }
 
     @Override