From 130ff22d820d9c20a1bc7545031954ae59dad0ef Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 20 Apr 2014 17:00:46 +0000 Subject: QPID-5713 : [Java Broker] Remove non-test references to model singleton, and instead treat as an instance variable git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588794 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/servlet/rest/ConfiguredObjectToMapConverter.java | 12 +----------- .../server/management/plugin/servlet/rest/RestServlet.java | 11 +++++------ .../management/plugin/servlet/rest/StructureServlet.java | 8 ++++---- .../server/management/plugin/HttpManagementFactoryTest.java | 6 ++++++ .../qpid/server/management/plugin/HttpManagementTest.java | 9 +++++++++ .../servlet/rest/ConfiguredObjectToMapConverterTest.java | 3 ++- 6 files changed, 27 insertions(+), 22 deletions(-) (limited to 'qpid/java/broker-plugins/management-http') diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java index b4e386a685..7c5ba5a6be 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java @@ -26,15 +26,12 @@ import java.util.List; import java.util.Map; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Model; public class ConfiguredObjectToMapConverter { /** Name of the key used for the statistics map */ public static final String STATISTICS_MAP_KEY = "statistics"; - private Model _model = Model.getInstance(); - public Map convertObjectToMap(final ConfiguredObject confObject, Class clazz, int depth) @@ -51,13 +48,6 @@ public class ConfiguredObjectToMapConverter return object; } - /** - * Used for unit test only. - */ - void setModel(Model model) - { - _model = model; - } private void incorporateAttributesIntoMap( final ConfiguredObject confObject, Map object) @@ -110,7 +100,7 @@ public class ConfiguredObjectToMapConverter Class clazz, int depth, Map object) { - for(Class childClass : _model.getChildTypes(clazz)) + for(Class childClass : confObject.getModel().getChildTypes(clazz)) { Collection children = confObject.getChildren(childClass); if(children != null) diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java index 22316fcf54..0309ecc838 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java @@ -43,7 +43,6 @@ import org.codehaus.jackson.map.SerializationConfig; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.State; public class RestServlet extends AbstractServlet @@ -152,7 +151,7 @@ public class RestServlet extends AbstractServlet for(int i = 0; i < _hierarchy.length; i++) { - if(i == 0 || Model.getInstance().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i])) + if(i == 0 || getBroker().getModel().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i])) { for(ConfiguredObject parent : parents) @@ -276,7 +275,7 @@ public class RestServlet extends AbstractServlet ConfiguredObject child) { Collection ancestors = new HashSet(); - Collection> parentTypes = Model.getInstance().getParentTypes(childType); + Collection> parentTypes = child.getModel().getParentTypes(childType); for(Class parentClazz : parentTypes) { @@ -406,7 +405,7 @@ public class RestServlet extends AbstractServlet { for(int j = i-1; j >=0; j--) { - if(Model.getInstance().getChildTypes(_hierarchy[j]).contains(_hierarchy[i])) + if(getBroker().getModel().getChildTypes(_hierarchy[j]).contains(_hierarchy[i])) { for(ConfiguredObject parent : objects[j]) { @@ -426,7 +425,7 @@ public class RestServlet extends AbstractServlet } List parents = new ArrayList(); Class objClass = getConfiguredClass(); - Collection> parentClasses = Model.getInstance().getParentTypes(objClass); + Collection> parentClasses = getBroker().getModel().getParentTypes(objClass); for(int i = _hierarchy.length-2; i >=0 ; i--) { if(parentClasses.contains(_hierarchy[i])) @@ -488,7 +487,7 @@ public class RestServlet extends AbstractServlet return true; } - Collection> parentClasses = Model.getInstance().getParentTypes(objClass); + Collection> parentClasses = obj.getModel().getParentTypes(objClass); for (ConfiguredObject parent : otherParents) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java index 40d3c02768..907610c8d2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java @@ -28,12 +28,12 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Model; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; + public class StructureServlet extends AbstractServlet { public StructureServlet() @@ -70,7 +70,7 @@ public class StructureServlet extends AbstractServlet structure.put("id", object.getId()); structure.put("name", object.getName()); - for(Class childClass : Model.getInstance().getChildTypes(clazz)) + for(Class childClass : object.getModel().getChildTypes(clazz)) { Collection children = object.getChildren(childClass); if(children != null) diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java index fbdb34fb96..809b2405b1 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java @@ -26,7 +26,10 @@ import java.util.Map; import java.util.UUID; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.ConfiguredObjectFactory; +import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.test.utils.QpidTestCase; public class HttpManagementFactoryTest extends QpidTestCase @@ -46,6 +49,9 @@ public class HttpManagementFactoryTest extends QpidTestCase _attributes.put(HttpManagement.TIME_OUT, SESSION_TIMEOUT); _attributes.put(ConfiguredObject.ID, _id); when(_broker.getCategoryClass()).thenReturn(Broker.class); + ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); + when(_broker.getObjectFactory()).thenReturn(objectFactory); + when(_broker.getModel()).thenReturn(objectFactory.getModel()); HttpManagement management = _pluginFactory.createInstance(_attributes, _broker); management.open(); diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java index 56dc947482..b747ee5435 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java @@ -31,7 +31,10 @@ import java.util.UUID; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.ConfiguredObjectFactory; +import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.test.utils.QpidTestCase; public class HttpManagementTest extends QpidTestCase @@ -46,6 +49,12 @@ public class HttpManagementTest extends QpidTestCase super.setUp(); _id = UUID.randomUUID(); _broker = mock(Broker.class); + ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()); + + when(_broker.getObjectFactory()).thenReturn(objectFactory); + when(_broker.getModel()).thenReturn(objectFactory.getModel()); + when(_broker.getCategoryClass()).thenReturn(Broker.class); + Map attributes = new HashMap(); attributes.put(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); attributes.put(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED, true); diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java index 0c2b6a5385..82c8d01379 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java @@ -93,9 +93,10 @@ public class ConfiguredObjectToMapConverterTest extends TestCase final String childAttributeValue = "childvalue"; Model model = createTestModel(); - _converter.setModel(model); TestChild mockChild = mock(TestChild.class); + when(mockChild.getModel()).thenReturn(model); + when(_configuredObject.getModel()).thenReturn(model); configureMockToReturnOneAttribute(mockChild, childAttributeName, childAttributeValue); when(_configuredObject.getChildren(TestChild.class)).thenReturn(Arrays.asList(mockChild)); -- cgit v1.2.1