QPID-5581 : [Java Broker] rename SimpleAMQQueue to AbstractQueue

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

41 files changed, 85 insertions, 88 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 21d8da0b94..0131ad0458 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -144,15 +144,15 @@ public abstract class AbstractExchange<T extends Exchange> implements Exchange<T
         }
 
         // Log Exchange creation
-        CurrentActor.get().message(ExchangeMessages.CREATED(getType().getType(), _name, _durable));
+        CurrentActor.get().message(ExchangeMessages.CREATED(getExchangeType().getType(), _name, _durable));
     }
 
-    public abstract ExchangeType<T> getType();
+    public abstract ExchangeType<T> getExchangeType();
 
     @Override
     public String getTypeName()
     {
-        return getType().getType();
+        return getExchangeType().getType();
     }
 
     public boolean isDurable()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
index 3c001f8b31..764c169781 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
@@ -31,9 +31,6 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.consumer.Consumer;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.messages.ExchangeMessages;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.MessageReference;
@@ -72,7 +69,7 @@ public class DefaultExchange implements Exchange<DirectExchange>
     }
 
     @Override
-    public ExchangeType<DirectExchange> getType()
+    public ExchangeType<DirectExchange> getExchangeType()
     {
         return DirectExchange.TYPE;
     }
@@ -166,7 +163,7 @@ public class DefaultExchange implements Exchange<DirectExchange>
     @Override
     public String getTypeName()
     {
-        return getType().getType();
+        return getExchangeType().getType();
     }
 
     @Override
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
index f9e654f1f2..74eb063455 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
@@ -137,7 +137,7 @@ public class DirectExchange extends AbstractExchange<DirectExchange>
     }
 
     @Override
-    public ExchangeType<DirectExchange> getType()
+    public ExchangeType<DirectExchange> getExchangeType()
     {
         return TYPE;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index 7cce4fde88..7902892a46 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
@@ -37,7 +37,7 @@ public interface Exchange<T extends Exchange> extends ExchangeReferrer, MessageD
 
     String getName();
 
-    ExchangeType<T> getType();
+    ExchangeType<T> getExchangeType();
 
     String getTypeName();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index a4d73ed4c4..d302ed6041 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
@@ -73,7 +73,7 @@ public class FanoutExchange extends AbstractExchange<FanoutExchange>
     }
 
     @Override
-    public ExchangeType<FanoutExchange> getType()
+    public ExchangeType<FanoutExchange> getExchangeType()
     {
         return TYPE;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index 6017e15446..8c1ea48031 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
@@ -87,7 +87,7 @@ public class HeadersExchange extends AbstractExchange<HeadersExchange>
     }
 
     @Override
-    public ExchangeType<HeadersExchange> getType()
+    public ExchangeType<HeadersExchange> getExchangeType()
     {
         return TYPE;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index 2efeb4f2ff..7c8c7ccb88 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
@@ -65,7 +65,7 @@ public class TopicExchange extends AbstractExchange<TopicExchange>
     }
 
     @Override
-    public ExchangeType<TopicExchange> getType()
+    public ExchangeType<TopicExchange> getExchangeType()
     {
         return TYPE;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
index a633162e85..476dff249a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
@@ -42,7 +42,7 @@ public class BindingLogSubject extends AbstractLogSubject
     {
         setLogStringWithFormat(BINDING_FORMAT,
                                queue.getVirtualHost().getName(),
-                               exchange.getType().getType(),
+                               exchange.getExchangeType().getType(),
                                exchange.getName(),
                                queue.getName(),
                                routingKey);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
index 5affafad75..6a03ce3693 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
@@ -32,6 +32,6 @@ public class ExchangeLogSubject extends AbstractLogSubject
     public ExchangeLogSubject(Exchange exchange, VirtualHost vhost)
     {
         setLogStringWithFormat(EXCHANGE_FORMAT, vhost.getName(),
-                               exchange.getType().getType(), exchange.getName());
+                               exchange.getExchangeType().getType(), exchange.getName());
     }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
index cfd1af1f4b..3c38ba89c8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
@@ -79,7 +79,7 @@ final class ExchangeAdapter extends AbstractConfiguredObject<ExchangeAdapter> im
     @Override
     public String getType()
     {
-        return _exchange.getType().getType();
+        return _exchange.getExchangeType().getType();
     }
 
     public Collection<org.apache.qpid.server.model.Binding> getBindings()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 45660dec37..ac118e76a3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -67,12 +67,15 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import javax.security.auth.Subject;
 
-abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E, Q,L>, L extends SimpleQueueEntryList<E,Q,L>> implements AMQQueue<E, Q, QueueConsumer<?,E,Q,L>>,
-                                       StateChangeListener<QueueConsumer<?,E,Q,L>, QueueConsumer.State>,
-                                       MessageGroupManager.ConsumerResetHelper<E,Q,L>
+abstract class AbstractQueue<E extends QueueEntryImpl<E,Q,L>,
+                              Q extends AbstractQueue<E, Q,L>,
+                              L extends QueueEntryListBase<E,Q,L>>
+        implements AMQQueue<E, Q, QueueConsumer<?,E,Q,L>>,
+                   StateChangeListener<QueueConsumer<?,E,Q,L>, QueueConsumer.State>,
+                   MessageGroupManager.ConsumerResetHelper<E,Q,L>
 {
 
-    private static final Logger _logger = Logger.getLogger(SimpleAMQQueue.class);
+    private static final Logger _logger = Logger.getLogger(AbstractQueue.class);
 
     public static final String SHARED_MSG_GROUP_ARG_VALUE = "1";
     private static final String QPID_NO_GROUP = "qpid.no-group";
@@ -187,9 +190,9 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
     private AMQQueue.NotificationListener _notificationListener;
     private final long[] _lastNotificationTimes = new long[NotificationCheck.values().length];
 
-    protected SimpleAMQQueue(VirtualHost virtualHost,
-                             Map<String, Object> attributes,
-                             QueueEntryListFactory<E, Q, L> entryListFactory)
+    protected AbstractQueue(VirtualHost virtualHost,
+                            Map<String, Object> attributes,
+                            QueueEntryListFactory<E, Q, L> entryListFactory)
     {
         if (virtualHost == null)
         {
@@ -456,7 +459,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
             @Override
             public void performAction(final Deletable object)
             {
-                getVirtualHost().removeQueue(SimpleAMQQueue.this);
+                getVirtualHost().removeQueue(AbstractQueue.this);
             }
         };
 
@@ -1692,7 +1695,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
     boolean flushConsumer(QueueConsumer<?,E,Q,L> sub, long iterations)
     {
         boolean atTail = false;
-        final boolean keepSendLockHeld = iterations <=  SimpleAMQQueue.MAX_ASYNC_DELIVERIES;
+        final boolean keepSendLockHeld = iterations <=  AbstractQueue.MAX_ASYNC_DELIVERIES;
         boolean queueEmpty = false;
 
         try
@@ -2212,7 +2215,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
 
         public boolean equals(Object o)
         {
-            return o instanceof SimpleAMQQueue.QueueEntryListener
+            return o instanceof AbstractQueue.QueueEntryListener
                     && _sub == ((QueueEntryListener) o)._sub;
         }
 
@@ -2380,7 +2383,7 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
                 {
                     try
                     {
-                        SimpleAMQQueue.this.enqueue(message, postEnqueueAction);
+                        AbstractQueue.this.enqueue(message, postEnqueueAction);
                     }
                     finally
                     {
@@ -2606,9 +2609,9 @@ abstract class SimpleAMQQueue<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleA
         @Override
         public void performAction(final Deletable object)
         {
-            if(SimpleAMQQueue.this._exclusiveOwner == _lifetimeObject)
+            if(AbstractQueue.this._exclusiveOwner == _lifetimeObject)
             {
-                SimpleAMQQueue.this._exclusiveOwner = null;
+                AbstractQueue.this._exclusiveOwner = null;
             }
             if(_deleteTask != null)
             {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
index efc82c0ab4..d8209e66ca 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java
@@ -28,7 +28,7 @@ import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
 
-public class AssignedConsumerMessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> implements MessageGroupManager<E,Q,L>
+public class AssignedConsumerMessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> implements MessageGroupManager<E,Q,L>
 {
     private static final Logger _logger = LoggerFactory.getLogger(AssignedConsumerMessageGroupManager.class);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
index d9c130953a..1ffa404caf 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
-public class ConflationQueue extends SimpleAMQQueue<ConflationQueueList.ConflationQueueEntry, ConflationQueue, ConflationQueueList>
+public class ConflationQueue extends AbstractQueue<ConflationQueueList.ConflationQueueEntry, ConflationQueue, ConflationQueueList>
 {
     public static final String DEFAULT_LVQ_KEY = "qpid.LVQ_key";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
index e67591ae07..ebf8058584 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/DefinedGroupMessageGroupManager.java
@@ -32,7 +32,7 @@ import org.apache.qpid.server.message.ServerMessage;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DefinedGroupMessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> implements MessageGroupManager<E,Q,L>
+public class DefinedGroupMessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> implements MessageGroupManager<E,Q,L>
 {
     private static final Logger _logger = LoggerFactory.getLogger(DefinedGroupMessageGroupManager.class);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupManager.java
index ba9dbc8a70..820114f33f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupManager.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.server.queue;
 
-public interface MessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+public interface MessageGroupManager<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>>
 {
-    public interface ConsumerResetHelper<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+    public interface ConsumerResetHelper<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>>
     {
         public void resetSubPointersForGroups(QueueConsumer<?,E,Q,L> consumer, boolean clearAssignments);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java
index 369f42b183..7e4ed5401d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntry.java
@@ -24,7 +24,7 @@ import org.apache.qpid.server.message.ServerMessage;
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-public abstract class OrderedQueueEntry<E extends OrderedQueueEntry<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> extends QueueEntryImpl<E,Q,L>
+public abstract class OrderedQueueEntry<E extends OrderedQueueEntry<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> extends QueueEntryImpl<E,Q,L>
 {
     static final AtomicReferenceFieldUpdater<OrderedQueueEntry, OrderedQueueEntry>
                 _nextUpdater =
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
index f2491bdb0c..a8bf3eecca 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OrderedQueueEntryList.java
@@ -26,7 +26,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-public abstract class OrderedQueueEntryList<E extends OrderedQueueEntry<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> implements SimpleQueueEntryList<E,Q,L>
+public abstract class OrderedQueueEntryList<E extends OrderedQueueEntry<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> implements
+                                                                                                                                                        QueueEntryListBase<E,Q,L>
 {
 
     private final E _head;
@@ -111,12 +112,12 @@ public abstract class OrderedQueueEntryList<E extends OrderedQueueEntry<E,Q,L>,
         return node.getNextValidEntry();
     }
 
-    public static interface HeadCreator<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+    public static interface HeadCreator<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>>
     {
         E createHead(L list);
     }
 
-    public static class QueueEntryIteratorImpl<E extends OrderedQueueEntry<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> implements QueueEntryIterator<E,Q,L,QueueConsumer<?,E,Q,L>>
+    public static class QueueEntryIteratorImpl<E extends OrderedQueueEntry<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends OrderedQueueEntryList<E,Q,L>> implements QueueEntryIterator<E,Q,L,QueueConsumer<?,E,Q,L>>
     {
         private E _lastNode;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
index 28d926686f..20229ec3ff 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
@@ -24,7 +24,7 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import java.util.Map;
 
-public abstract class OutOfOrderQueue<E extends QueueEntryImpl<E,Q,L>, Q extends OutOfOrderQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> extends SimpleAMQQueue<E,Q,L>
+public abstract class OutOfOrderQueue<E extends QueueEntryImpl<E,Q,L>, Q extends OutOfOrderQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> extends AbstractQueue<E,Q,L>
 {
 
     protected OutOfOrderQueue(VirtualHost virtualHost,
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
index 43f0b4254c..757db35af9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
@@ -113,7 +113,7 @@ public class QueueArgumentsConverter
             if(wireArguments.containsKey(QPID_SHARED_MSG_GROUP))
             {
                 modelArguments.put(Queue.MESSAGE_GROUP_SHARED_GROUPS,
-                        SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE.equals(String.valueOf(wireArguments.get(QPID_SHARED_MSG_GROUP))));
+                                   AbstractQueue.SHARED_MSG_GROUP_ARG_VALUE.equals(String.valueOf(wireArguments.get(QPID_SHARED_MSG_GROUP))));
             }
             if(wireArguments.get(X_QPID_DLQ_ENABLED) != null)
             {
@@ -143,7 +143,7 @@ public class QueueArgumentsConverter
 
         if(Boolean.TRUE.equals(modelArguments.get(Queue.MESSAGE_GROUP_SHARED_GROUPS)))
         {
-            wireArguments.put(QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE);
+            wireArguments.put(QPID_SHARED_MSG_GROUP, AbstractQueue.SHARED_MSG_GROUP_ARG_VALUE);
         }
 
         return wireArguments;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
index f7654d63fa..b2f473f9ff 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
@@ -24,7 +24,7 @@ import org.apache.qpid.server.consumer.Consumer;
 import org.apache.qpid.server.consumer.ConsumerTarget;
 import org.apache.qpid.server.message.MessageInstance;
 
-interface QueueConsumer<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> extends Consumer
+interface QueueConsumer<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> extends Consumer
 {
 
     void flushBatched();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
index eeeab76656..ae30e53e9a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
@@ -33,7 +33,6 @@ import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.MessageConverterRegistry;
-import org.apache.qpid.server.consumer.Consumer;
 import org.apache.qpid.server.consumer.ConsumerTarget;
 import org.apache.qpid.server.util.StateChangeListener;
 
@@ -47,7 +46,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.SUBSCRIPTION_FORMAT;
 
-class QueueConsumerImpl<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> implements QueueConsumer<T,E,Q,L>
+class QueueConsumerImpl<T extends ConsumerTarget, E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> implements QueueConsumer<T,E,Q,L>
 {
 
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java
index 2cf0e93e9c..1f1320cfd2 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-class QueueConsumerList<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E, Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+class QueueConsumerList<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E, Q,L>, L extends QueueEntryListBase<E,Q,L>>
 {
     private final ConsumerNode<E,Q,L> _head = new ConsumerNode<E,Q,L>();
 
@@ -32,7 +32,7 @@ class QueueConsumerList<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueu
     private final AtomicReference<ConsumerNode<E,Q,L>> _subNodeMarker = new AtomicReference<ConsumerNode<E,Q,L>>(_head);
     private final AtomicInteger _size = new AtomicInteger();
 
-    public static final class ConsumerNode<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E, Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+    public static final class ConsumerNode<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E, Q,L>, L extends QueueEntryListBase<E,Q,L>>
     {
         private final AtomicBoolean _deleted = new AtomicBoolean();
         private final AtomicReference<ConsumerNode<E,Q,L>> _next = new AtomicReference<ConsumerNode<E,Q,L>>();
@@ -237,7 +237,7 @@ class QueueConsumerList<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueu
     }
 
 
-    public static class ConsumerNodeIterator<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E, Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+    public static class ConsumerNodeIterator<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E, Q,L>, L extends QueueEntryListBase<E,Q,L>>
     {
         private ConsumerNode<E,Q,L> _lastNode;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
index 7a59c154b6..45673aa555 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueContext.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.queue;
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-final class QueueContext<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+final class QueueContext<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>>
 {
     private volatile E _lastSeenEntry;
     private volatile E _releasedEntry;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 1f09fe3fb9..5407985cd8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-public abstract class QueueEntryImpl<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> implements QueueEntry<E,Q,QueueConsumer<?,E,Q,L>>
+public abstract class QueueEntryImpl<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> implements QueueEntry<E,Q,QueueConsumer<?,E,Q,L>>
 {
     private static final Logger _log = Logger.getLogger(QueueEntryImpl.class);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListBase.java
index b6954e0696..f997e7383f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListBase.java
@@ -20,6 +20,6 @@
  */
 package org.apache.qpid.server.queue;
 
-public interface SimpleQueueEntryList<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> extends QueueEntryList<E,Q,L,QueueConsumer<?,E,Q,L>>
+public interface QueueEntryListBase<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> extends QueueEntryList<E,Q,L,QueueConsumer<?,E,Q,L>>
 {
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
index ae8b6560be..6e66fd2905 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
@@ -20,7 +20,7 @@
 */
 package org.apache.qpid.server.queue;
 
-interface QueueEntryListFactory<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>>
+interface QueueEntryListFactory<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>>
 {
     public L createQueueEntryList(Q queue);
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
index fb4740dd4a..d9f3297acf 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
@@ -40,7 +40,7 @@ public class QueueRunner implements Runnable
 {
     private static final Logger _logger = Logger.getLogger(QueueRunner.class);
 
-    private final SimpleAMQQueue _queue;
+    private final AbstractQueue _queue;
 
     private static int IDLE = 0;
     private static int SCHEDULED = 1;
@@ -53,7 +53,7 @@ public class QueueRunner implements Runnable
     private final AtomicLong _lastRunAgain = new AtomicLong();
     private final AtomicLong _lastRunTime = new AtomicLong();
 
-    public QueueRunner(SimpleAMQQueue queue)
+    public QueueRunner(AbstractQueue queue)
     {
         _queue = queue;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
index 05b874cd91..801f9261f8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
@@ -30,7 +30,7 @@ import org.apache.qpid.server.queue.SortedQueueEntry.Colour;
  * ISBN-13: 978-0262033848
  * see http://en.wikipedia.org/wiki/Red-black_tree
  */
-public class SortedQueueEntryList implements SimpleQueueEntryList<SortedQueueEntry, SortedQueue, SortedQueueEntryList>
+public class SortedQueueEntryList implements QueueEntryListBase<SortedQueueEntry, SortedQueue, SortedQueueEntryList>
 {
     private final SortedQueueEntry _head;
     private SortedQueueEntry _root;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
index e5050eca86..51c2d7c7b5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
@@ -25,7 +25,7 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import java.util.Map;
 
-public class StandardQueue extends SimpleAMQQueue<StandardQueueEntry,StandardQueue,StandardQueueEntryList>
+public class StandardQueue extends AbstractQueue<StandardQueueEntry,StandardQueue,StandardQueueEntryList>
 {
     public StandardQueue(final VirtualHost virtualHost,
                          final Map<String, Object> arguments)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
index 3026f33604..9ef32e61e2 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
@@ -46,7 +46,7 @@ class SubFlushRunner implements Runnable
     private final AtomicInteger _scheduled = new AtomicInteger(IDLE);
 
 
-    private static final long ITERATIONS = SimpleAMQQueue.MAX_ASYNC_DELIVERIES;
+    private static final long ITERATIONS = AbstractQueue.MAX_ASYNC_DELIVERIES;
     private final AtomicBoolean _stateChange = new AtomicBoolean();
 
     public SubFlushRunner(QueueConsumerImpl sub)
@@ -92,9 +92,9 @@ class SubFlushRunner implements Runnable
         }
     }
 
-    private SimpleAMQQueue getQueue()
+    private AbstractQueue getQueue()
     {
-        return (SimpleAMQQueue) _sub.getQueue();
+        return (AbstractQueue) _sub.getQueue();
     }
 
     public String toString()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
index 88caf73032..efdca3b67d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
@@ -132,7 +132,7 @@ public class DefaultUpgraderProvider implements UpgraderProvider
             else
             {
                 return _exchangeRegistry.getExchange(exchangeId) != null
-                       && _exchangeRegistry.getExchange(exchangeId).getType() == TopicExchange.TYPE;
+                       && _exchangeRegistry.getExchange(exchangeId).getExchangeType() == TopicExchange.TYPE;
             }
 
         }
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index 258ee1ba85..0d4f2b2227 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -190,7 +190,7 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
                      exchangeParts.length);
 
         assertEquals("Exchange type not correct",
-                     exchange.getType().getType(), exchangeParts[0]);
+                     exchange.getExchangeType().getType(), exchangeParts[0]);
 
         assertEquals("Exchange name not correct",
                      exchange.getName(), exchangeParts[1]);
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 4e517609bc..e05a9d43da 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -43,7 +43,6 @@ import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.plugin.ExchangeType;
-import org.apache.qpid.server.security.*;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.util.MapValueConverter;
@@ -155,7 +154,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
                         when(exchange.getName()).thenReturn(name);
                         when(exchange.getId()).thenReturn(id);
-                        when(exchange.getType()).thenReturn(exType);
+                        when(exchange.getExchangeType()).thenReturn(exType);
 
                         final String typeName = MapValueConverter.getStringAttribute(org.apache.qpid.server.model.Exchange.TYPE, attributeValues);
                         when(exType.getType()).thenReturn(typeName);
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index 8f4ebf1b2e..d5e7a92e8a 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -42,7 +42,7 @@ import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.queue.SimpleAMQQueue.QueueEntryFilter;
+import org.apache.qpid.server.queue.AbstractQueue.QueueEntryFilter;
 import org.apache.qpid.server.consumer.MockConsumer;
 import org.apache.qpid.server.consumer.Consumer;
 import org.apache.qpid.server.util.Action;
@@ -50,9 +50,9 @@ import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 
-abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends SimpleAMQQueue<E,Q,L>, L extends SimpleQueueEntryList<E,Q,L>> extends QpidTestCase
+abstract class AbstractQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> extends QpidTestCase
 {
-    private static final Logger _logger = Logger.getLogger(SimpleAMQQueueTestBase.class);
+    private static final Logger _logger = Logger.getLogger(AbstractQueueTestBase.class);
 
 
     private Q _queue;
@@ -319,7 +319,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
     /**
      * Tests that if a client releases entries 'out of order' (the order
      * used by QueueEntryImpl.compareTo) that messages are still resent
-     * successfully.  Specifically this test ensures the {@see SimpleAMQQueue#requeue()}
+     * successfully.  Specifically this test ensures the {@see AbstractQueue#requeue()}
      * can correctly move the _releasedEntry to an earlier position in the QueueEntry list.
      */
     public void testReleasedOutOfComparableOrderAreRedelivered() throws Exception
@@ -646,7 +646,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
      */
     public void testProcessQueueWithUniqueSelectors() throws Exception
     {
-        SimpleAMQQueue testQueue = createNonAsyncDeliverQueue();
+        AbstractQueue testQueue = createNonAsyncDeliverQueue();
 
         // retrieve the QueueEntryList the queue creates and insert the test
         // messages, thus avoiding straight-through delivery attempts during
@@ -703,7 +703,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
         verifyReceivedMessages(Collections.singletonList((MessageInstance)msg5), sub3.getMessages());
     }
 
-    private SimpleAMQQueue createNonAsyncDeliverQueue()
+    private AbstractQueue createNonAsyncDeliverQueue()
     {
         TestSimpleQueueEntryListFactory factory = new TestSimpleQueueEntryListFactory();
         return new NonAsyncDeliverQueue(factory, getVirtualHost());
@@ -711,7 +711,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
 
     /**
      * Tests that dequeued message is not present in the list returned form
-     * {@link SimpleAMQQueue#getMessagesOnTheQueue()}
+     * {@link AbstractQueue#getMessagesOnTheQueue()}
      */
     public void testGetMessagesOnTheQueueWithDequeuedEntry()
     {
@@ -748,7 +748,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
 
     /**
      * Tests that dequeued message is not present in the list returned form
-     * {@link SimpleAMQQueue#getMessagesOnTheQueue(QueueEntryFilter)}
+     * {@link AbstractQueue#getMessagesOnTheQueue(QueueEntryFilter)}
      */
     public void testGetMessagesOnTheQueueByQueueEntryFilterWithDequeuedEntry()
     {
@@ -796,7 +796,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
 
     /**
      * Tests that all messages including dequeued one are deleted from the queue
-     * on invocation of {@link SimpleAMQQueue#clearQueue()}
+     * on invocation of {@link AbstractQueue#clearQueue()}
      */
     public void testClearQueueWithDequeuedEntry() throws Exception
     {
@@ -890,7 +890,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
      * @param queue
      * @param messageNumber
      */
-    protected <T extends SimpleAMQQueue> void putGivenNumberOfMessages(T queue, int messageNumber)
+    protected <T extends AbstractQueue> void putGivenNumberOfMessages(T queue, int messageNumber)
     {
         for (int i = 0; i < messageNumber; i++)
         {
@@ -1101,7 +1101,7 @@ abstract class SimpleAMQQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends
     }
 
 
-    private static class NonAsyncDeliverQueue extends SimpleAMQQueue<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
+    private static class NonAsyncDeliverQueue extends AbstractQueue<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
     {
         public NonAsyncDeliverQueue(final TestSimpleQueueEntryListFactory factory, VirtualHost vhost)
         {
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index acddd49c04..f6c700f959 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -35,7 +35,7 @@ import org.apache.qpid.server.consumer.Consumer;
 
 import static org.mockito.Mockito.when;
 
-public class PriorityQueueTest extends SimpleAMQQueueTestBase
+public class PriorityQueueTest extends AbstractQueueTestBase
 {
 
     @Override
@@ -49,7 +49,7 @@ public class PriorityQueueTest extends SimpleAMQQueueTestBase
     {
 
         // Enqueue messages in order
-        SimpleAMQQueue queue = getQueue();
+        AbstractQueue queue = getQueue();
         queue.enqueue(createMessage(1L, (byte) 10), null);
         queue.enqueue(createMessage(2L, (byte) 4), null);
         queue.enqueue(createMessage(3L, (byte) 0), null);
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueThreadPoolTest.java
index 1d4bfa9960..234ac5dffa 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueThreadPoolTest.java
@@ -30,7 +30,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 import java.util.HashMap;
 import java.util.Map;
 
-public class SimpleAMQQueueThreadPoolTest extends QpidTestCase
+public class QueueThreadPoolTest extends QpidTestCase
 {
 
     @Override
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 4dd0423c27..da69700f6b 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
 
 import static org.mockito.Mockito.mock;
 
-public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry, StandardQueue, StandardQueueEntryList>
+public class StandardQueueTest extends AbstractQueueTestBase<StandardQueueEntry, StandardQueue, StandardQueueEntryList>
 {
 
     public void testCreationFailsWithNoVhost()
@@ -162,7 +162,7 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
     public void testEnqueueDequeuedEntry() throws Exception
     {
         // create a queue where each even entry is considered a dequeued
-        SimpleAMQQueue queue = new DequeuedQueue(getVirtualHost());
+        AbstractQueue queue = new DequeuedQueue(getVirtualHost());
         // create a consumer
         MockConsumer consumer = new MockConsumer();
 
@@ -188,7 +188,7 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
 
     /**
      * Tests whether dequeued entry is sent to subscriber in result of
-     * invocation of {@link SimpleAMQQueue#processQueue(QueueRunner)}
+     * invocation of {@link AbstractQueue#processQueue(QueueRunner)}
      */
     public void testProcessQueueWithDequeuedEntry() throws Exception
     {
@@ -264,7 +264,7 @@ public class StandardQueueTest extends SimpleAMQQueueTestBase<StandardQueueEntry
     }
 
 
-    private static class DequeuedQueue extends SimpleAMQQueue<DequeuedQueueEntry, DequeuedQueue, DequeuedQueueEntryList>
+    private static class DequeuedQueue extends AbstractQueue<DequeuedQueueEntry, DequeuedQueue, DequeuedQueueEntryList>
     {
 
         public DequeuedQueue(VirtualHost virtualHost)
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
index 6801c50722..324a0a809e 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
@@ -53,8 +53,6 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
@@ -86,11 +84,11 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
 
 
         _directExchange = mock(Exchange.class);
-        when(_directExchange.getType()).thenReturn(DirectExchange.TYPE);
+        when(_directExchange.getExchangeType()).thenReturn(DirectExchange.TYPE);
 
 
         _topicExchange = mock(Exchange.class);
-        when(_topicExchange.getType()).thenReturn(TopicExchange.TYPE);
+        when(_topicExchange.getExchangeType()).thenReturn(TopicExchange.TYPE);
 
         AMQQueue queue = mock(AMQQueue.class);
 
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index c03daf20b3..8caf4b3ab5 100644
--- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -926,7 +926,7 @@ public class ServerSessionDelegate extends SessionDelegate
             {
                 exception(session, method, ExecutionErrorCode.NOT_FOUND, "Exchange: '" + method.getExchange() + "' not found");
             }
-            else if(exchange.getType().equals(HeadersExchange.TYPE) && (!method.hasArguments() || method.getArguments() == null || !method.getArguments().containsKey("x-match")))
+            else if(exchange.getExchangeType().equals(HeadersExchange.TYPE) && (!method.hasArguments() || method.getArguments() == null || !method.getArguments().containsKey("x-match")))
             {
                 exception(session, method, ExecutionErrorCode.INTERNAL_ERROR, "Bindings to an exchange of type " + HeadersExchange.TYPE.getType() + " require an x-match header");
             }
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
index 8eb6c63542..78278b09c8 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
@@ -119,7 +119,7 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
             if (!exch.isBound(bindingKey, arguments, queue))
             {
 
-                if(!exch.addBinding(bindingKey, queue, arguments) && TopicExchange.TYPE.equals(exch.getType()))
+                if(!exch.addBinding(bindingKey, queue, arguments) && TopicExchange.TYPE.equals(exch.getExchangeType()))
                 {
                     Binding oldBinding = exch.getBinding(bindingKey, queue, arguments);
 
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index f757137cf1..5d9cd4b80a 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
@@ -249,7 +249,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
                     {
                         if(!hasBindingFilter
                            && entry.getValue() instanceof ExactSubjectFilter
-                           && exchange.getType() == DirectExchange.TYPE)
+                           && exchange.getExchangeType() == DirectExchange.TYPE)
                         {
                             ExactSubjectFilter filter = (ExactSubjectFilter) filters.values().iterator().next();
                             source.setFilter(filters);
@@ -259,7 +259,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
                         }
                         else if(!hasBindingFilter
                                 && entry.getValue() instanceof MatchingSubjectFilter
-                                && exchange.getType() == TopicExchange.TYPE)
+                                && exchange.getExchangeType() == TopicExchange.TYPE)
                         {
                             MatchingSubjectFilter filter = (MatchingSubjectFilter) filters.values().iterator().next();
                             source.setFilter(filters);