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

2 files changed, 13 insertions, 11 deletions

diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index 69fc06f2d0..4c9eae6f3e 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
@@ -148,7 +148,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
                     // if the queue name is in the gathered list then inspect its binding arguments
                     // only topic exchange should have a JMS selector key in binding
                     if (potentialDurableSubs.contains(queueName)
-                            && exchangeName.equals(ExchangeDefaults.TOPIC_EXCHANGE_NAME))
+                            && exchangeName.equals(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME)))
                     {
                         if (arguments == null)
                         {
@@ -342,11 +342,11 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
 
                 FieldTable emptyArguments = new FieldTable();
                 addBindingToDatabase(bindingTuple, newBindingsDatabase, transaction, queueNameAMQ,
-                        ExchangeDefaults.DIRECT_EXCHANGE_NAME, queueNameAMQ, emptyArguments);
+                        AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_NAME), queueNameAMQ, emptyArguments);
 
                 // TODO QPID-3490 we should not persist a default exchange binding
                 addBindingToDatabase(bindingTuple, newBindingsDatabase, transaction, queueNameAMQ,
-                        ExchangeDefaults.DEFAULT_EXCHANGE_NAME, queueNameAMQ, emptyArguments);
+                        AMQShortString.valueOf(ExchangeDefaults.DEFAULT_EXCHANGE_NAME), queueNameAMQ, emptyArguments);
             }
         };
         new DatabaseTemplate(environment, NEW_QUEUE_DB_NAME, NEW_BINDINGS_DB_NAME, transaction).run(queueCreateOperation);
@@ -364,7 +364,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
                     DatabaseEntry key, DatabaseEntry value)
             {
                 ExchangeRecord record = binding.entryToObject(value);
-                if (ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(record.getType()))
+                if (AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS).equals(record.getType()))
                 {
                     topicExchanges.add(record.getName());
                 }
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index 5d84dc2c91..a478872ad0 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
@@ -87,11 +87,14 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
     static final String OLD_BRIDGES_DB_NAME = "bridges_v5";
     static final String OLD_LINKS_DB_NAME = "links_v5";
 
-    static final String[] DEFAULT_EXCHANGES = { ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString(),
-            ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString(), ExchangeDefaults.FANOUT_EXCHANGE_NAME.asString(),
-            ExchangeDefaults.HEADERS_EXCHANGE_NAME.asString(), ExchangeDefaults.TOPIC_EXCHANGE_NAME.asString(),
-            ExchangeDefaults.DIRECT_EXCHANGE_NAME.asString() };
-    private static final Set<String> DEFAULT_EXCHANGES_SET = new HashSet<String>(Arrays.asList(DEFAULT_EXCHANGES));
+    private static final Set<String> DEFAULT_EXCHANGES_SET =
+            new HashSet<String>(Arrays.asList(
+                    ExchangeDefaults.DEFAULT_EXCHANGE_NAME,
+                    ExchangeDefaults.FANOUT_EXCHANGE_NAME,
+                    ExchangeDefaults.HEADERS_EXCHANGE_NAME,
+                    ExchangeDefaults.TOPIC_EXCHANGE_NAME,
+                    ExchangeDefaults.DIRECT_EXCHANGE_NAME));
+
     private static final String ARGUMENTS = "arguments";
 
     private MapJsonSerializer _serializer = new MapJsonSerializer();
@@ -454,8 +457,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
                 {
                     // TODO: check and remove orphaned bindings
                     BindingRecord bindingRecord = binding.entryToObject(key);
-                    String exchangeName = bindingRecord.getExchangeName() == null ? ExchangeDefaults.DEFAULT_EXCHANGE_NAME
-                            .asString() : bindingRecord.getExchangeName().asString();
+                    String exchangeName = bindingRecord.getExchangeName() == null ? ExchangeDefaults.DEFAULT_EXCHANGE_NAME : bindingRecord.getExchangeName().asString();
                     String queueName = bindingRecord.getQueueName().asString();
                     String routingKey = bindingRecord.getRoutingKey().asString();
                     FieldTable arguments = bindingRecord.getArguments();