QPID-5665 : [Java Broker] Unify VirtualHost model and implementation classes

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

2 files changed, 12 insertions, 11 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
index d6d52f86ba..7aa86313b2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
@@ -77,7 +77,7 @@ public class MessageContentServlet extends AbstractServlet
         String vhostName = pathInfoElements[0];
         String queueName = pathInfoElements[1];
 
-        VirtualHost<?> vhost = null;
+        VirtualHost<?,?,?> vhost = null;
 
         for(VirtualHost vh : getBroker().getVirtualHosts())
         {
@@ -91,7 +91,7 @@ public class MessageContentServlet extends AbstractServlet
         return getQueueFromVirtualHost(queueName, vhost);
     }
 
-    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
+    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?,?,?> vhost)
     {
         Queue queue = null;
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
index b23f0cb168..f72471b7d4 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
@@ -31,6 +31,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
 import org.apache.qpid.server.consumer.ConsumerImpl;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.MessageReference;
@@ -41,8 +44,6 @@ import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.queue.QueueEntryVisitor;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.access.Operation;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
 
 public class MessageServlet extends AbstractServlet
 {
@@ -134,9 +135,9 @@ public class MessageServlet extends AbstractServlet
         String vhostName = pathInfoElements[0];
         String queueName = pathInfoElements[1];
 
-        VirtualHost<?> vhost = null;
+        VirtualHost<?,?,?> vhost = null;
 
-        for(VirtualHost<?> vh : getBroker().getVirtualHosts())
+        for(VirtualHost<?,?,?> vh : getBroker().getVirtualHosts())
         {
             if(vh.getName().equals(vhostName))
             {
@@ -148,11 +149,11 @@ public class MessageServlet extends AbstractServlet
         return getQueueFromVirtualHost(queueName, vhost);
     }
 
-    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
+    private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?,?,?> vhost)
     {
         Queue queue = null;
 
-        for(Queue q : vhost.getQueues())
+        for(Queue<?> q : vhost.getQueues())
         {
 
             if(q.getName().equals(queueName))
@@ -420,7 +421,7 @@ public class MessageServlet extends AbstractServlet
             String destQueueName = (String) providedObject.get("destinationQueue");
             Boolean move = (Boolean) providedObject.get("move");
 
-            final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
+            final VirtualHost<?,?,?> vhost = sourceQueue.getParent(VirtualHost.class);
 
             boolean isMoveTransaction = move != null && Boolean.valueOf(move);
 
@@ -461,7 +462,7 @@ public class MessageServlet extends AbstractServlet
 
         final Queue<?> sourceQueue = getQueueFromRequest(request);
 
-        final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
+        final VirtualHost<?,?,?> vhost = sourceQueue.getParent(VirtualHost.class);
 
 
         final List<Long> messageIds = new ArrayList<Long>();
@@ -485,7 +486,7 @@ public class MessageServlet extends AbstractServlet
 
     }
 
-    private void authorizeMethod(String methodName, VirtualHost<?> vhost)
+    private void authorizeMethod(String methodName, VirtualHost<?,?,?> vhost)
     {
         SecurityManager securityManager = getBroker().getSecurityManager();
         securityManager.authoriseMethod(Operation.UPDATE, "VirtualHost.Queue", methodName, vhost.getName());