diff options
| author | Keith Wall <kwall@apache.org> | 2014-07-20 09:18:41 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-07-20 09:18:41 +0000 |
| commit | d2930a2952a59aec97c2971f1aa55019feeb94ae (patch) | |
| tree | 7692946abf68ceb18c3df6461a40c31e99e4999e /java/broker-core/src | |
| parent | 259fb7f010a5f90721851bebe2617f70c08d9876 (diff) | |
| download | qpid-python-d2930a2952a59aec97c2971f1aa55019feeb94ae.tar.gz | |
QPID-5867: [Java Broker] Allow the virtualhost's permitted node list to passed via the virtualhostnode's virtualhost blueprint context variable.
Work completed by Andrew MacBean <macbean@apache.org> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1612064 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-core/src')
3 files changed, 8 insertions, 9 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java index 2a286379f4..b2a124a309 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java @@ -44,8 +44,6 @@ public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandard implements VirtualHostNode<X> { private static final Logger LOGGER = Logger.getLogger(AbstractStandardVirtualHostNode.class); - public static final String VIRTUALHOST_BLUEPRINT_CONTEXT_VAR = "virtualhostBlueprint"; - public static final String VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR = "virtualhostBlueprintUtilised"; public AbstractStandardVirtualHostNode(Map<String, Object> attributes, Broker<?> parent) diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java index c9220b7b74..368ac58bee 100644 --- a/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java +++ b/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java @@ -47,6 +47,8 @@ import java.util.concurrent.atomic.AtomicReference; public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<X>> extends AbstractConfiguredObject<X> implements VirtualHostNode<X> { + public static final String VIRTUALHOST_BLUEPRINT_CONTEXT_VAR = "virtualhostBlueprint"; + public static final String VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR = "virtualhostBlueprintUtilised"; private static final Logger LOGGER = Logger.getLogger(AbstractVirtualHostNode.class); private final Broker<?> _broker; diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java b/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java index d7c35ba6a8..884e729c52 100644 --- a/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java +++ b/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.virtualhostnode; -import static org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode.*; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -145,7 +144,7 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase String vhBlueprint = String.format("{ \"type\" : \"%s\", \"name\" : \"%s\"}", TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, TEST_VIRTUAL_HOST_NAME); - Map<String, String> context = Collections.singletonMap(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + Map<String, String> context = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); Map<String, Object> nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); @@ -166,10 +165,10 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase Map<String, String> updatedContext = node.getContext(); assertTrue("Context should now have utilised flag", updatedContext.containsKey( - VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); + AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); assertEquals("Utilised flag should be true", Boolean.TRUE.toString(), - updatedContext.get(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); + updatedContext.get(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); } /** @@ -185,8 +184,8 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, TEST_VIRTUAL_HOST_NAME); Map<String, String> context = new HashMap<>(); - context.put(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); - context.put(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR, Boolean.TRUE.toString()); + context.put(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + context.put(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR, Boolean.TRUE.toString()); Map<String, Object> nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); @@ -217,7 +216,7 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase String vhBlueprint = String.format("{ \"type\" : \"%s\", \"name\" : \"%s\"}", TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, "vhFromBlueprint"); - Map<String, String> context = Collections.singletonMap(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + Map<String, String> context = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); Map<String, Object> nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); |