QPID-5579 : [Java Broker] build attribute meta data the same way for REST API and AMQP Management

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

6 files changed, 33 insertions, 37 deletions

diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
index e418275d7e..cb3cde8259 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
@@ -40,23 +40,14 @@ import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;
 import org.apache.qpid.server.jmx.mbeans.Shutdown;
 import org.apache.qpid.server.jmx.mbeans.VirtualHostMBean;
 import org.apache.qpid.server.logging.log4j.LoggingManagementFacade;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.*;
 import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
 import org.apache.qpid.server.plugin.PluginFactory;
 import org.apache.qpid.server.plugin.QpidServiceLoader;
 import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
-public class JMXManagement extends AbstractPluginAdapter implements ConfigurationChangeListener
+public class JMXManagement extends AbstractPluginAdapter<JMXManagement> implements ConfigurationChangeListener
 {
     private static final Logger LOGGER = Logger.getLogger(JMXManagement.class);
 
@@ -71,13 +62,6 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
     public static final boolean DEFAULT_USE_PLATFORM_MBEAN_SERVER = true;
 
     @SuppressWarnings("serial")
-    private static final Collection<String> AVAILABLE_ATTRIBUTES = Collections.unmodifiableCollection(new HashSet<String>(Plugin.AVAILABLE_ATTRIBUTES){{
-        add(NAME);
-        add(USE_PLATFORM_MBEAN_SERVER);
-        add(PluginFactory.PLUGIN_TYPE);
-    }});
-
-    @SuppressWarnings("serial")
     private static final Map<String, Object> DEFAULTS = new HashMap<String, Object>(){{
         put(USE_PLATFORM_MBEAN_SERVER, DEFAULT_USE_PLATFORM_MBEAN_SERVER);
         put(NAME, DEFAULT_NAME);
@@ -125,13 +109,13 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
 
     private void start() throws JMException, IOException
     {
-        Broker broker = getBroker();
+        Broker<?> broker = getBroker();
         Port connectorPort = null;
         Port registryPort = null;
-        Collection<Port> ports = broker.getPorts();
+        Collection<Port<?>> ports = broker.getPorts();
         for (Port port : ports)
         {
-            if (State.QUIESCED.equals(port.getActualState()))
+            if (State.QUIESCED.equals(port.getState()))
             {
                 continue;
             }
@@ -160,7 +144,7 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
 
         synchronized (_children)
         {
-            for(VirtualHost virtualHost : broker.getVirtualHosts())
+            for(VirtualHost<?> virtualHost : broker.getVirtualHosts())
             {
                 if(!_children.containsKey(virtualHost))
                 {
@@ -177,8 +161,8 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
                     createAdditionalMBeansFromProviders(virtualHost, mbean);
                 }
             }
-            Collection<AuthenticationProvider> authenticationProviders = broker.getAuthenticationProviders();
-            for (AuthenticationProvider authenticationProvider : authenticationProviders)
+            Collection<AuthenticationProvider<?>> authenticationProviders = broker.getAuthenticationProviders();
+            for (AuthenticationProvider<?> authenticationProvider : authenticationProviders)
             {
                 if(authenticationProvider instanceof PasswordCredentialManagingAuthenticationProvider)
                 {
@@ -336,7 +320,7 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
     @Override
     public Collection<String> getAttributeNames()
     {
-        return AVAILABLE_ATTRIBUTES;
+        return Attribute.getAttributeNames(JMXManagement.class);
     }
 
     @Override
@@ -374,4 +358,16 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
             }
         }
     }
+
+    @Override
+    public String getPluginType()
+    {
+        return PLUGIN_TYPE;
+    }
+
+    @ManagedAttribute
+    public boolean getUsePlatformMBeanServer()
+    {
+        return (Boolean)getAttribute(USE_PLATFORM_MBEAN_SERVER);
+    }
 }
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
index ed5e195043..27901bfbf7 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
@@ -112,7 +112,7 @@ public class ExchangeMBean extends AMQManagedObject implements ManagedExchange
     }
     
     
-    private final Exchange _exchange;
+    private final Exchange<?> _exchange;
     private final VirtualHostMBean _vhostMBean;
 
     protected ExchangeMBean(Exchange exchange, VirtualHostMBean virtualHostMBean)
@@ -151,7 +151,7 @@ public class ExchangeMBean extends AMQManagedObject implements ManagedExchange
 
     public String getExchangeType()
     {
-        return _exchange.getExchangeType();
+        return _exchange.getType();
     }
 
     public Integer getTicketNo()
@@ -171,7 +171,7 @@ public class ExchangeMBean extends AMQManagedObject implements ManagedExchange
 
     public TabularData bindings() throws IOException, JMException
     {
-        if(HEADERS_EXCHANGE_TYPE.equals(_exchange.getExchangeType()))
+        if(HEADERS_EXCHANGE_TYPE.equals(_exchange.getType()))
         {
             return getHeadersBindings(_exchange.getBindings()); 
         }
@@ -235,7 +235,7 @@ public class ExchangeMBean extends AMQManagedObject implements ManagedExchange
 
         for (Binding binding : bindings)
         {
-            String key = FANOUT_EXCHANGE_TYPE.equals(_exchange.getExchangeType()) ? "*" : binding.getName();
+            String key = FANOUT_EXCHANGE_TYPE.equals(_exchange.getType()) ? "*" : binding.getName();
             List<String> queueList = bindingMap.get(key);
             if(queueList == null)
             {
@@ -268,7 +268,7 @@ public class ExchangeMBean extends AMQManagedObject implements ManagedExchange
     @Override
     public void createNewBinding(String queueName, String binding, Map<String, Object> arguments) throws JMException
     {
-        if(HEADERS_EXCHANGE_TYPE.equals(_exchange.getExchangeType()))
+        if(HEADERS_EXCHANGE_TYPE.equals(_exchange.getType()))
         {
             arguments = new HashMap<String, Object>(arguments);
             final String[] bindings = binding.split(",");
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
index 97e84d4796..575fec58e9 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/MBeanUtils.java
@@ -29,7 +29,7 @@ import org.apache.qpid.server.model.VirtualHost;
 
 public class MBeanUtils
 {
-    public static Queue findQueueFromQueueName(VirtualHost virtualHost, String queueName) throws OperationsException
+    public static Queue findQueueFromQueueName(VirtualHost<?> virtualHost, String queueName) throws OperationsException
     {
         Queue queue = ConfiguredObjectFinder.findConfiguredObjectByName(virtualHost.getQueues(), queueName);
         if (queue == null)
@@ -42,7 +42,7 @@ public class MBeanUtils
         }
     }
 
-    public static  Exchange findExchangeFromExchangeName(VirtualHost virtualHost, String exchangeName) throws OperationsException
+    public static  Exchange findExchangeFromExchangeName(VirtualHost<?> virtualHost, String exchangeName) throws OperationsException
     {
         Exchange exchange = ConfiguredObjectFinder.findConfiguredObjectByName(virtualHost.getExchanges(), exchangeName);
         if (exchange == null)
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
index b44a752312..67abe77e1f 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
@@ -115,7 +115,7 @@ public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueN
         }
     }
 
-    private final Queue _queue;
+    private final Queue<?> _queue;
     private final VirtualHostMBean _vhostMBean;
 
     /** Date/time format used for message expiration and message timestamp formatting */
@@ -298,7 +298,7 @@ public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueN
         }
         else
         {
-            VirtualHost virtualHost = _queue.getParent(VirtualHost.class);
+            VirtualHost<?> virtualHost = _queue.getParent(VirtualHost.class);
             Exchange exchange = MBeanUtils.findExchangeFromExchangeName(virtualHost, exchangeName);
 
             _queue.setAttribute(Queue.ALTERNATE_EXCHANGE, getAlternateExchange(), exchange);
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
index e9e3e1df49..906f1a481d 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
@@ -45,7 +45,7 @@ public class VirtualHostMBean extends AMQManagedObject implements ManagedVirtual
 {
     private static final Logger LOGGER = Logger.getLogger(VirtualHostMBean.class);
 
-    private final VirtualHost _virtualHost;
+    private final VirtualHost<?> _virtualHost;
 
     private final Map<ConfiguredObject, AMQManagedObject> _children =
             new HashMap<ConfiguredObject, AMQManagedObject>();
diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
index e2b4567867..746dc0e63f 100644
--- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
@@ -64,7 +64,7 @@ public class ExchangeMBeanTest extends TestCase
     {
         _mockExchange = mock(Exchange.class);
         when(_mockExchange.getName()).thenReturn(EXCHANGE_NAME);
-        when(_mockExchange.getExchangeType()).thenReturn(EXCHANGE_TYPE);
+        when(_mockExchange.getType()).thenReturn(EXCHANGE_TYPE);
         _mockVirtualHostMBean = mock(VirtualHostMBean.class);
 
         _mockManagedObjectRegistry = mock(ManagedObjectRegistry.class);
@@ -80,7 +80,7 @@ public class ExchangeMBeanTest extends TestCase
         _exchangeMBean = new ExchangeMBean(_mockExchange, _mockVirtualHostMBean);
 
         _mockHeadersExchange = mock(Exchange.class);
-        when(_mockHeadersExchange.getExchangeType()).thenReturn(ExchangeMBean.HEADERS_EXCHANGE_TYPE);
+        when(_mockHeadersExchange.getType()).thenReturn(ExchangeMBean.HEADERS_EXCHANGE_TYPE);
         when(_mockHeadersExchange.getParent(VirtualHost.class)).thenReturn(mockVirtualHost);
 
     }