From f2ed5bb3b4a1c10ad81818a44e3f2b73983007db Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 9 Apr 2014 14:13:13 +0000 Subject: QPID-5672 : [Java Broker] move variable interpolation to the configured object git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585979 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugins/ACLFileAccessControlProvider.java | 9 ++++++- .../v0_10/MessageConverter_Internal_to_v0_10.java | 5 ++-- .../protocol/v0_10/MessageConverter_v0_10.java | 4 +-- .../v0_10/MessageConverter_v0_10_to_Internal.java | 12 ++------- .../server/protocol/v0_10/ServerConnection.java | 8 +++--- .../protocol/v0_10/ServerConnectionDelegate.java | 4 +-- .../qpid/server/protocol/v0_10/ServerSession.java | 5 ++-- .../protocol/v0_10/ServerSessionDelegate.java | 24 ++++++++--------- .../server/protocol/v0_10/ServerSessionTest.java | 6 ++--- .../qpid/server/protocol/v0_8/AMQChannel.java | 6 ++--- .../server/protocol/v0_8/AMQProtocolEngine.java | 8 +++--- .../server/protocol/v0_8/AMQProtocolSession.java | 6 ++--- .../v0_8/MessageConverter_Internal_to_v0_8.java | 4 +-- .../v0_8/MessageConverter_v0_8_to_Internal.java | 5 ++-- .../v0_8/handler/BasicConsumeMethodHandler.java | 4 +-- .../v0_8/handler/BasicGetMethodHandler.java | 4 +-- .../v0_8/handler/BasicPublishMethodHandler.java | 4 +-- .../protocol/v0_8/handler/ChannelOpenHandler.java | 4 +-- .../v0_8/handler/ConnectionOpenMethodHandler.java | 4 +-- .../v0_8/handler/ExchangeBoundHandler.java | 4 +-- .../v0_8/handler/ExchangeDeclareHandler.java | 4 +-- .../v0_8/handler/ExchangeDeleteHandler.java | 4 +-- .../protocol/v0_8/handler/QueueBindHandler.java | 4 +-- .../protocol/v0_8/handler/QueueDeclareHandler.java | 6 ++--- .../protocol/v0_8/handler/QueueDeleteHandler.java | 4 +-- .../protocol/v0_8/handler/QueuePurgeHandler.java | 4 +-- .../protocol/v0_8/handler/QueueUnbindHandler.java | 4 +-- .../qpid/server/protocol/v0_8/AMQChannelTest.java | 4 +-- .../apache/qpid/server/protocol/v0_8/AckTest.java | 4 +-- .../qpid/server/protocol/v0_8/AcknowledgeTest.java | 4 +-- .../server/protocol/v0_8/BrokerTestHelper_0_8.java | 5 ++-- .../protocol/v0_8/InternalTestProtocolSession.java | 4 +-- .../protocol/v0_8/QueueBrowserUsesNoAckTest.java | 5 ++-- .../qpid/server/protocol/v1_0/Connection_1_0.java | 31 +++++++++++----------- .../protocol/v1_0/MessageConverter_to_1_0.java | 4 +-- .../v1_0/MessageConverter_v1_0_to_Internal.java | 15 ++--------- .../protocol/v1_0/ProtocolEngine_1_0_0_SASL.java | 1 - .../server/protocol/v1_0/ReceivingLink_1_0.java | 6 ++--- .../qpid/server/protocol/v1_0/SendingLink_1_0.java | 8 +++--- .../qpid/server/protocol/v1_0/Session_1_0.java | 6 ++--- .../protocol/v1_0/TxnCoordinatorLink_1_0.java | 6 ++--- .../v0_10_v1_0/MessageConverter_1_0_to_v0_10.java | 9 +++---- .../v0_8_v0_10/MessageConverter_0_10_to_0_8.java | 12 ++++----- .../v0_8_v0_10/MessageConverter_0_8_to_0_10.java | 4 +-- .../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java | 4 +-- .../server/management/amqp/ManagementNode.java | 4 +-- .../rest/ConfiguredObjectToMapConverter.java | 16 +++++++++++ .../plugin/servlet/rest/RestServlet.java | 20 +++++++++++--- .../qpid/server/jmx/JMXManagementFactoryTest.java | 10 +++---- 49 files changed, 176 insertions(+), 166 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java index 7772925382..be2f2e3163 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java @@ -60,7 +60,6 @@ public class ACLFileAccessControlProvider Collections.emptyMap(), attributes, broker.getTaskExecutor()); - _accessControl = new DefaultAccessControl(getPath(), broker); _broker = broker; State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING); @@ -68,6 +67,13 @@ public class ACLFileAccessControlProvider } + @Override + protected void onOpen() + { + super.onOpen(); + _accessControl = new DefaultAccessControl(getPath(), _broker); + } + @ManagedAttribute( automate = true, mandatory = true ) public String getPath() { @@ -155,6 +161,7 @@ public class ACLFileAccessControlProvider if(desiredState == State.DELETED) { + deleted(); return _state.compareAndSet(state, State.DELETED); } else if (desiredState == State.QUIESCED) diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java index 7ff3873856..0d43c84fdd 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java @@ -20,12 +20,11 @@ */ package org.apache.qpid.server.protocol.v0_10; -import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.message.internal.InternalMessage; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.store.StoreFuture; import org.apache.qpid.server.store.StoredMessage; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.Header; import org.apache.qpid.transport.MessageDeliveryPriority; @@ -48,7 +47,7 @@ public class MessageConverter_Internal_to_v0_10 implements MessageConverter> public void setPublishFrame(MessagePublishInfo info, final MessageDestination e) { String routingKey = info.getRoutingKey() == null ? null : info.getRoutingKey().asString(); - VirtualHost virtualHost = getVirtualHost(); + VirtualHostImpl virtualHost = getVirtualHost(); SecurityManager securityManager = virtualHost.getSecurityManager(); securityManager.authorisePublish(info.isImmediate(), routingKey, e.getName(), virtualHost.getName()); @@ -1534,7 +1534,7 @@ public class AMQChannel> return _blocking.get(); } - public VirtualHost getVirtualHost() + public VirtualHostImpl getVirtualHost() { return getProtocolSession().getVirtualHost(); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index a86530fe0e..7b04c99ca2 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -79,7 +79,7 @@ import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.apache.qpid.server.util.ServerScopedRuntimeException; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.Sender; import org.apache.qpid.transport.TransportException; import org.apache.qpid.transport.network.NetworkConnection; @@ -100,7 +100,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi private String _clientVersion = null; private String _clientProduct = null; - private VirtualHost _virtualHost; + private VirtualHostImpl _virtualHost; private final Map> _channelMap = new HashMap>(); @@ -1152,12 +1152,12 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi return getMethodRegistry(); } - public VirtualHost getVirtualHost() + public VirtualHostImpl getVirtualHost() { return _virtualHost; } - public void setVirtualHost(VirtualHost virtualHost) throws AMQException + public void setVirtualHost(VirtualHostImpl virtualHost) throws AMQException { _virtualHost = virtualHost; diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java index ade087ef21..bab0aaf3da 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolSession.java @@ -38,7 +38,7 @@ import org.apache.qpid.protocol.AMQVersionAwareProtocolSession; import org.apache.qpid.server.protocol.AMQConnectionModel; import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter; import org.apache.qpid.server.security.AuthorizationHolder; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; public interface AMQProtocolSession> @@ -174,9 +174,9 @@ public interface AMQProtocolSession> Object getReference(); - VirtualHost getVirtualHost(); + VirtualHostImpl getVirtualHost(); - void setVirtualHost(VirtualHost virtualHost) throws AMQException; + void setVirtualHost(VirtualHostImpl virtualHost) throws AMQException; public ProtocolOutputConverter getProtocolOutputConverter(); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java index 9ba212d1ed..28c1e528f4 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java @@ -30,7 +30,7 @@ import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.store.StoreFuture; import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.codec.BBEncoder; import java.io.ByteArrayOutputStream; @@ -60,7 +60,7 @@ public class MessageConverter_Internal_to_v0_8 implements MessageConverter @@ -72,7 +72,7 @@ public class ConnectionOpenMethodHandler implements StateAwareMethodListener public void methodReceived(AMQStateManager stateManager, QueueBindBody body, int channelId) throws AMQException { AMQProtocolSession protocolConnection = stateManager.getProtocolSession(); - VirtualHost virtualHost = protocolConnection.getVirtualHost(); + VirtualHostImpl virtualHost = protocolConnection.getVirtualHost(); AMQChannel channel = protocolConnection.getChannel(channelId); if (channel == null) diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java index 97aac8424a..19550e8c8d 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java @@ -40,7 +40,7 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueArgumentsConverter; import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager; import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import java.security.AccessControlException; import java.util.Map; @@ -62,7 +62,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener _replies; private Broker _broker; diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java index 6b697f8221..e1e37ad3bd 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java @@ -36,7 +36,7 @@ import org.apache.qpid.server.store.TestMemoryMessageStore; import org.apache.qpid.server.txn.AutoCommitTransaction; import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.BrokerTestHelper; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; import java.util.ArrayList; @@ -60,7 +60,7 @@ public class AckTest extends QpidTestCase private AMQQueue _queue; private static final AMQShortString DEFAULT_CONSUMER_TAG = new AMQShortString("conTag"); - private VirtualHost _virtualHost; + private VirtualHostImpl _virtualHost; @Override public void setUp() throws Exception diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java index 399564f5a4..34331973e8 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AcknowledgeTest.java @@ -26,7 +26,7 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.TestMemoryMessageStore; import org.apache.qpid.server.util.BrokerTestHelper; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; import java.util.List; @@ -44,7 +44,7 @@ public class AcknowledgeTest extends QpidTestCase super.setUp(); BrokerTestHelper.setUp(); _channel = BrokerTestHelper_0_8.createChannel(); - VirtualHost virtualHost = _channel.getVirtualHost(); + VirtualHostImpl virtualHost = _channel.getVirtualHost(); _queueName = getTestName(); _queue = BrokerTestHelper.createQueue(_queueName, virtualHost); _messageStore = virtualHost.getMessageStore(); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java index 580b912552..8b80504d6e 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java @@ -25,10 +25,9 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.abstraction.MessagePublishInfo; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.util.BrokerTestHelper; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -61,7 +60,7 @@ public class BrokerTestHelper_0_8 extends BrokerTestHelper public static InternalTestProtocolSession createProtocolSession(String hostName) throws Exception { - VirtualHost virtualHost = createVirtualHost(hostName); + VirtualHostImpl virtualHost = createVirtualHost(hostName); return new InternalTestProtocolSession(virtualHost, createBrokerMock()); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java index 18949bba50..2322865c80 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java @@ -49,7 +49,7 @@ import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.protocol.v0_8.output.ProtocolOutputConverter; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.security.auth.UsernamePrincipal; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.Sender; import org.apache.qpid.transport.network.NetworkConnection; @@ -61,7 +61,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr private AtomicInteger _deliveryCount = new AtomicInteger(0); private static final AtomicLong ID_GENERATOR = new AtomicLong(0); - public InternalTestProtocolSession(VirtualHost virtualHost, Broker broker) throws AMQException + public InternalTestProtocolSession(VirtualHostImpl virtualHost, Broker broker) throws AMQException { super(broker, new TestNetworkConnection(), ID_GENERATOR.getAndIncrement(), null, null); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java index 520e35fe39..211c17b746 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.protocol.v0_8; -import org.apache.qpid.AMQException; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.AMQShortString; @@ -29,7 +28,7 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.TestMemoryMessageStore; import org.apache.qpid.server.util.BrokerTestHelper; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; import java.util.List; @@ -47,7 +46,7 @@ public class QueueBrowserUsesNoAckTest extends QpidTestCase super.setUp(); BrokerTestHelper.setUp(); _channel = BrokerTestHelper_0_8.createChannel(); - VirtualHost virtualHost = _channel.getVirtualHost(); + VirtualHostImpl virtualHost = _channel.getVirtualHost(); _queueName = getTestName(); _queue = BrokerTestHelper.createQueue(_queueName, virtualHost); _messageStore = virtualHost.getMessageStore(); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java index 00c78581e1..ddd88a0df8 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java @@ -20,18 +20,28 @@ */ package org.apache.qpid.server.protocol.v1_0; +import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT; + import java.net.SocketAddress; import java.security.Principal; import java.security.PrivilegedAction; import java.text.MessageFormat; +import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.security.auth.Subject; + import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint; import org.apache.qpid.amqp_1_0.transport.ConnectionEventListener; import org.apache.qpid.amqp_1_0.transport.LinkEndpoint; import org.apache.qpid.amqp_1_0.transport.SessionEndpoint; - import org.apache.qpid.amqp_1_0.transport.SessionEventListener; -import org.apache.qpid.amqp_1_0.type.transport.*; +import org.apache.qpid.amqp_1_0.type.transport.AmqpError; +import org.apache.qpid.amqp_1_0.type.transport.End; import org.apache.qpid.amqp_1_0.type.transport.Error; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.connection.ConnectionPrincipal; @@ -46,16 +56,7 @@ import org.apache.qpid.server.security.SubjectCreator; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.util.Action; -import org.apache.qpid.server.virtualhost.VirtualHost; - -import javax.security.auth.Subject; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; - -import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CONNECTION_FORMAT; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class Connection_1_0 implements ConnectionEventListener, AMQConnectionModel { @@ -63,7 +64,7 @@ public class Connection_1_0 implements ConnectionEventListener, AMQConnectionMod private final Port _port; private final Broker _broker; private final SubjectCreator _subjectCreator; - private VirtualHost _vhost; + private VirtualHostImpl _vhost; private final Transport _transport; private final ConnectionEndpoint _conn; private final long _connectionId; @@ -130,7 +131,7 @@ public class Connection_1_0 implements ConnectionEventListener, AMQConnectionMod String host = _conn.getLocalHostname(); if(host == null || host.trim().equals("")) { - host = (String)_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST); + host = _broker.getDefaultVirtualHost(); } _vhost = _broker.getVirtualHostRegistry().getVirtualHost(host); _vhost.getConnectionRegistry().registerConnection(this); @@ -432,7 +433,7 @@ public class Connection_1_0 implements ConnectionEventListener, AMQConnectionMod return _subject; } - VirtualHost getVirtualHost() + VirtualHostImpl getVirtualHost() { return _vhost; } diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java index 40f738b8e7..b8157b8f9e 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java @@ -40,7 +40,7 @@ import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.store.StoreFuture; import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.codec.BBDecoder; import org.apache.qpid.typedmessage.TypedBytesContentReader; import org.apache.qpid.typedmessage.TypedBytesFormatException; @@ -60,7 +60,7 @@ public abstract class MessageConverter_to_1_0 implement } @Override - public final Message_1_0 convert(M message, VirtualHost vhost) + public final Message_1_0 convert(M message, VirtualHostImpl vhost) { SectionEncoder sectionEncoder = new SectionEncoderImpl(_typeRegistry); diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java index bb01ddad7f..077ea7819b 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java @@ -23,18 +23,7 @@ package org.apache.qpid.server.protocol.v1_0; import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry; import org.apache.qpid.server.message.internal.InternalMessage; import org.apache.qpid.server.plugin.MessageConverter; -import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.server.virtualhost.VirtualHost; -import org.apache.qpid.transport.codec.BBDecoder; -import org.apache.qpid.typedmessage.TypedBytesContentReader; -import org.apache.qpid.typedmessage.TypedBytesFormatException; - -import java.io.EOFException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class MessageConverter_v1_0_to_Internal implements MessageConverter { @@ -61,7 +50,7 @@ public class MessageConverter_v1_0_to_Internal implements MessageConverter _openTransactions = @@ -721,7 +721,7 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel _incompleteMessage; @@ -52,7 +52,7 @@ public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0 private Session_1_0 _session; - public TxnCoordinatorLink_1_0(VirtualHost vhost, + public TxnCoordinatorLink_1_0(VirtualHostImpl vhost, Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint, LinkedHashMap openTransactions) { diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java index a3c7ea31e0..01477ebb05 100644 --- a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java +++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10.java @@ -21,7 +21,6 @@ package org.apache.qpid.server.protocol.converter.v0_10_v1_0; import org.apache.qpid.server.message.AMQMessageHeader; -import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; @@ -29,7 +28,7 @@ import org.apache.qpid.server.protocol.v1_0.MessageConverter_from_1_0; import org.apache.qpid.server.protocol.v1_0.Message_1_0; import org.apache.qpid.server.store.StoreFuture; import org.apache.qpid.server.store.StoredMessage; -import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.Header; import org.apache.qpid.transport.MessageDeliveryPriority; @@ -53,13 +52,13 @@ public class MessageConverter_1_0_to_v0_10 implements MessageConverter convertToStoredMessage(final Message_1_0 serverMsg, - final VirtualHost vhost) + final VirtualHostImpl vhost) { Object bodyObject = MessageConverter_from_1_0.convertBodyToObject(serverMsg); @@ -124,7 +123,7 @@ public class MessageConverter_1_0_to_v0_10 implements MessageConverter convertToStoredMessage(final MessageTransferMessage message, - VirtualHost vhost) + VirtualHostImpl vhost) { final MessageMetaData metaData = convertMetaData(message, vhost); return new StoredMessage() @@ -221,14 +221,14 @@ public class MessageConverter_0_10_to_0_8 implements MessageConverter converted = new ArrayList(); + for(Object member : (Collection)value) + { + if(member instanceof ConfiguredObject) + { + converted.add(((ConfiguredObject)member).getName()); + } + else + { + converted.add(member); + } + } + object.put(name, converted); + } else if(value != null) { object.put(name, value); 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 00126200f8..22316fcf54 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 @@ -20,17 +20,32 @@ import java.io.BufferedWriter; import java.io.IOException; import java.io.Writer; import java.security.AccessControlException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.apache.qpid.server.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; +import org.apache.qpid.server.model.Model; +import org.apache.qpid.server.model.State; + public class RestServlet extends AbstractServlet { private static final Logger LOGGER = Logger.getLogger(RestServlet.class); @@ -458,7 +473,6 @@ public class RestServlet extends AbstractServlet catch (RuntimeException e) { setResponseStatus(response, e); - e.printStackTrace(); } } diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java index 62f0ad558a..d0da48fb3a 100644 --- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java +++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java @@ -18,15 +18,15 @@ */ package org.apache.qpid.server.jmx; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.test.utils.QpidTestCase; +import static org.mockito.Mockito.mock; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import static org.mockito.Mockito.mock; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.test.utils.QpidTestCase; public class JMXManagementFactoryTest extends QpidTestCase { @@ -41,7 +41,7 @@ public class JMXManagementFactoryTest extends QpidTestCase _attributes.put(ConfiguredObject.TYPE, JMXManagement.PLUGIN_TYPE); JMXManagement jmxManagement = _jmxManagementFactory.createInstance( _attributes, _broker); - + jmxManagement.open(); assertNotNull(jmxManagement); assertEquals("Unexpected plugin type", JMXManagement.PLUGIN_TYPE, jmxManagement.getType()); assertEquals("Unexpected default mbean platform", JMXManagement.DEFAULT_USE_PLATFORM_MBEAN_SERVER, jmxManagement.getAttribute(JMXManagement.USE_PLATFORM_MBEAN_SERVER)); -- cgit v1.2.1