QPID-5940 : Make ConfiguredObjectTypeRegistry more easy to test, and add some tests

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

2 files changed, 6 insertions, 4 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
index 0fefa93a81..55c2bf6901 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
@@ -82,7 +82,8 @@ public class MetaDataServlet extends AbstractServlet
     private Map<String,Map> processCategory(final Class<? extends ConfiguredObject> clazz)
     {
         Map<String, Map> typeToDataMap = new TreeMap<>();
-        for(Class<? extends ConfiguredObject> type : ConfiguredObjectTypeRegistry.getTypeSpecialisations(clazz))
+        ConfiguredObjectTypeRegistry typeRegistry = _instance.getTypeRegistry();
+        for(Class<? extends ConfiguredObject> type : typeRegistry.getTypeSpecialisations(clazz))
         {
             typeToDataMap.put(ConfiguredObjectTypeRegistry.getType(type), processType(type));
         }
@@ -99,7 +100,7 @@ public class MetaDataServlet extends AbstractServlet
     private Map<String,Map> processAttributes(final Class<? extends ConfiguredObject> type)
     {
         Collection<ConfiguredObjectAttribute<?, ?>> attributes =
-            ConfiguredObjectTypeRegistry.getAttributeTypes(type).values();
+            _instance.getTypeRegistry().getAttributeTypes(type).values();
 
         Map<String,Map> attributeDetails = new LinkedHashMap<>();
         for(ConfiguredObjectAttribute<?, ?> attribute : attributes)
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java
index 5d1e7cba21..c697603c6c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java
@@ -42,15 +42,16 @@ abstract class AbstractSpecialisedAttributeLister<T extends ConfiguredObject>  i
     @Override
     final public Object perform(Map<String, Object> request, Broker broker)
     {
+        ConfiguredObjectTypeRegistry typeRegistry = broker.getModel().getTypeRegistry();
         Collection<Class<? extends ConfiguredObject>> groupProviderTypes =
-                ConfiguredObjectTypeRegistry.getTypeSpecialisations(getCategoryClass());
+                typeRegistry.getTypeSpecialisations(getCategoryClass());
 
         Map<String, Object> attributes = new TreeMap<String, Object>();
 
         for (Class<? extends ConfiguredObject> groupProviderType : groupProviderTypes)
         {
             Collection<ConfiguredObjectAttribute<?, ?>> typeSpecificAttributes =
-                    ConfiguredObjectTypeRegistry.getTypeSpecificAttributes(groupProviderType);
+                    typeRegistry.getTypeSpecificAttributes(groupProviderType);
 
             Map<String, Object> data = new HashMap<String, Object>();