Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java Sun May 22 21:03:46 2016 @@ -38,7 +38,7 @@ import org.apache.qpid.framing.ContentHe import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.MessagePublishInfo; import org.apache.qpid.server.message.internal.InternalMessage; -import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.store.StoredMessage; @@ -64,7 +64,7 @@ public class MessageConverter_Internal_t } @Override - public AMQMessage convert(InternalMessage serverMsg, VirtualHost<?> vhost) + public AMQMessage convert(InternalMessage serverMsg, NamedAddressSpace addressSpace) { return new AMQMessage(convertToStoredMessage(serverMsg), null); }
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java Sun May 22 21:03:46 2016 @@ -33,7 +33,7 @@ import java.util.Set; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.message.AMQMessageHeader; import org.apache.qpid.server.message.internal.InternalMessage; -import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; @@ -58,7 +58,7 @@ public class MessageConverter_v0_8_to_In } @Override - public InternalMessage convert(AMQMessage serverMessage, VirtualHost<?> vhost) + public InternalMessage convert(AMQMessage serverMessage, NamedAddressSpace addressSpace) { final String mimeType = serverMessage.getMessageHeader().getMimeType(); byte[] data = new byte[(int) serverMessage.getSize()]; Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java Sun May 22 21:03:46 2016 @@ -65,8 +65,8 @@ public class ProtocolEngineCreator_0_8 i Transport transport, long id, final AggregateTicker aggregateTicker) { - final AMQPConnection_0_8 protocolEngine = - new AMQPConnection_0_8(broker, network, port, transport, getVersion(), id, aggregateTicker); + final AMQPConnection_0_8Impl protocolEngine = + new AMQPConnection_0_8Impl(broker, network, port, transport, getVersion(), id, aggregateTicker); protocolEngine.create(); return protocolEngine; } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java Sun May 22 21:03:46 2016 @@ -65,8 +65,8 @@ public class ProtocolEngineCreator_0_9 i Transport transport, long id, final AggregateTicker aggregateTicker) { - final AMQPConnection_0_8 protocolEngine = - new AMQPConnection_0_8(broker, network, port, transport, getVersion(), id, aggregateTicker); + final AMQPConnection_0_8Impl protocolEngine = + new AMQPConnection_0_8Impl(broker, network, port, transport, getVersion(), id, aggregateTicker); protocolEngine.create(); return protocolEngine; } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java Sun May 22 21:03:46 2016 @@ -66,8 +66,8 @@ public class ProtocolEngineCreator_0_9_1 Transport transport, long id, final AggregateTicker aggregateTicker) { - final AMQPConnection_0_8 protocolEngine = - new AMQPConnection_0_8(broker, network, port, transport, getVersion(), id, aggregateTicker); + final AMQPConnection_0_8Impl protocolEngine = + new AMQPConnection_0_8Impl(broker, network, port, transport, getVersion(), id, aggregateTicker); protocolEngine.create(); return protocolEngine; } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java Sun May 22 21:03:46 2016 @@ -50,12 +50,12 @@ import org.apache.qpid.util.GZIPUtils; public class ProtocolOutputConverterImpl implements ProtocolOutputConverter { private static final int BASIC_CLASS_ID = 60; - private final AMQPConnection_0_8 _connection; + private final AMQPConnection_0_8Impl _connection; private static final AMQShortString GZIP_ENCODING = AMQShortString.valueOf(GZIPUtils.GZIP_CONTENT_ENCODING); private static final Logger LOGGER = LoggerFactory.getLogger(ProtocolOutputConverterImpl.class); - public ProtocolOutputConverterImpl(AMQPConnection_0_8 connection) + public ProtocolOutputConverterImpl(AMQPConnection_0_8Impl connection) { _connection = connection; } @@ -80,7 +80,7 @@ public class ProtocolOutputConverterImpl } else { - return getMessageConverter(serverMessage).convert(serverMessage, _connection.getVirtualHost()); + return getMessageConverter(serverMessage).convert(serverMessage, _connection.getAddressSpace()); } } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Sun May 22 21:03:46 2016 @@ -51,6 +51,7 @@ import org.apache.qpid.server.model.Conn import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.port.AmqpPort; +import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.store.MessageHandle; import org.apache.qpid.server.store.MessageStore; @@ -92,7 +93,9 @@ public class AMQChannelTest extends Qpid when(_virtualHost.getContextValue(Boolean.class, Broker.BROKER_MSG_AUTH)).thenReturn(false); when(_virtualHost.getPrincipal()).thenReturn(mock(Principal.class)); when(_virtualHost.getEventLogger()).thenReturn(mock(EventLogger.class)); - when(_virtualHost.getSecurityManager()).thenReturn(new org.apache.qpid.server.security.SecurityManager(_broker, false)); + SecurityManager securityManager = new SecurityManager(_broker, false); + when(_broker.getSecurityManager()).thenReturn(securityManager); + when(_virtualHost.getSecurityManager()).thenReturn(securityManager); _port = mock(AmqpPort.class); when(_port.getChildExecutor()).thenReturn(taskExecutor); @@ -108,10 +111,14 @@ public class AMQChannelTest extends Qpid _amqConnection = mock(AMQPConnection_0_8.class); when(_amqConnection.getSubject()).thenReturn(authenticatedSubject); when(_amqConnection.getAuthorizedPrincipal()).thenReturn(authenticatedPrincipal); - when(_amqConnection.getVirtualHost()).thenReturn((VirtualHost)_virtualHost); + when(_amqConnection.getAddressSpace()).thenReturn((VirtualHost)_virtualHost); when(_amqConnection.getProtocolOutputConverter()).thenReturn(_protocolOutputConverter); when(_amqConnection.getBroker()).thenReturn((Broker) _broker); when(_amqConnection.getMethodRegistry()).thenReturn(new MethodRegistry(ProtocolVersion.v0_9)); + when(_amqConnection.getContextProvider()).thenReturn(_virtualHost); + when(_amqConnection.getEventLogger()).thenReturn(mock(EventLogger.class)); + when(_amqConnection.isAuthorizedMessagePrincipal(eq(authenticatedPrincipal.getName()))).thenReturn(true); + _messageDestination = mock(MessageDestination.class); } @@ -120,7 +127,7 @@ public class AMQChannelTest extends Qpid String testExchangeName = getTestName(); Exchange<?> exchange = mock(Exchange.class); when(exchange.hasBindings()).thenReturn(true); - doReturn(exchange).when(_virtualHost).getAttainedChildFromAddress(Exchange.class, testExchangeName); + doReturn(exchange).when(_virtualHost).getAttainedMessageDestination(testExchangeName); AMQChannel channel = new AMQChannel(_amqConnection, 1, _messageStore); @@ -135,7 +142,7 @@ public class AMQChannelTest extends Qpid { Exchange<?> exchange = mock(Exchange.class); when(exchange.hasBindings()).thenReturn(false); - doReturn(exchange).when(_virtualHost).getAttainedChildFromAddress(Exchange.class, getTestName()); + doReturn(exchange).when(_virtualHost).getAttainedMessageDestination(getTestName()); AMQChannel channel = new AMQChannel(_amqConnection, 1, _messageStore); channel.receiveExchangeDelete(AMQShortString.valueOf(getTestName()), true, false); @@ -165,7 +172,6 @@ public class AMQChannelTest extends Qpid public void testPublishContentHeaderWhenMessageAuthorizationFails() throws Exception { when(_virtualHost.getDefaultDestination()).thenReturn(mock(MessageDestination.class)); - when(_virtualHost.getContextValue(eq(Boolean.class), eq(Broker.BROKER_MSG_AUTH))).thenReturn(true); when(_virtualHost.getMessageStore()).thenReturn(new NullMessageStore() { @Override @@ -176,12 +182,6 @@ public class AMQChannelTest extends Qpid } }); - Set<Principal> authenticatedUser = Collections.<Principal>singleton(new AuthenticatedPrincipal("user")); - _amqConnection.setSubject(new Subject(true, - authenticatedUser, - Collections.<Principal>emptySet(), - Collections.<Principal>emptySet())); - _amqConnection.associateVirtualHost(_virtualHost); int channelId = 1; AMQChannel channel = new AMQChannel(_amqConnection, channelId, _virtualHost.getMessageStore()); @@ -198,7 +198,6 @@ public class AMQChannelTest extends Qpid public void testPublishContentHeaderWhenMessageAuthorizationSucceeds() throws Exception { when(_virtualHost.getDefaultDestination()).thenReturn(_messageDestination); - when(_virtualHost.getContextValue(Boolean.class, Broker.BROKER_MSG_AUTH)).thenReturn(true); when(_virtualHost.getMessageStore()).thenReturn(new NullMessageStore() { @Override @@ -209,10 +208,6 @@ public class AMQChannelTest extends Qpid } }); - Set<Principal> authenticatedUser = Collections.<Principal>singleton(new AuthenticatedPrincipal("user")); - _amqConnection.setSubject(new Subject(true, authenticatedUser, Collections.<Principal>emptySet(), Collections.<Principal>emptySet())); - _amqConnection.associateVirtualHost(_virtualHost); - AMQChannel channel = new AMQChannel(_amqConnection, 1, _virtualHost.getMessageStore()); BasicContentHeaderProperties properties = new BasicContentHeaderProperties(); Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java Sun May 22 21:03:46 2016 @@ -117,6 +117,8 @@ public class AMQPConnection_0_8Test exte when(_virtualHost.getModel()).thenReturn(model); when(_virtualHost.getCategoryClass()).thenReturn(VirtualHost.class); when(_virtualHost.getState()).thenReturn(State.ACTIVE); + when(_virtualHost.isActive()).thenReturn(true); + when(_virtualHost.getTaskExecutor()).thenReturn(_taskExecutor); when(_virtualHost.getPrincipal()).thenReturn(virtualHostPrincipal); when(_virtualHost.getContextValue(Integer.class, Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1024); @@ -144,7 +146,7 @@ public class AMQPConnection_0_8Test exte when(_port.getChildExecutor()).thenReturn(_taskExecutor); when(_port.getModel()).thenReturn(model); when(_port.getAuthenticationProvider()).thenReturn(authenticationProvider); - when(_port.getVirtualHost(VIRTUAL_HOST_NAME)).thenReturn(_virtualHost); + when(_port.getAddressSpace(VIRTUAL_HOST_NAME)).thenReturn(_virtualHost); when(_port.getContextValue(Long.class, Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY)).thenReturn(2500l); when(_port.getContextValue(Integer.class, Connection.MAX_MESSAGE_SIZE)).thenReturn(Connection.DEFAULT_MAX_MESSAGE_SIZE); @@ -174,8 +176,8 @@ public class AMQPConnection_0_8Test exte public void testCloseOnNoRoute() { { - AMQPConnection_0_8 - conn = new AMQPConnection_0_8(_broker, _network, _port, _transport, _protocol, 0, _ticker); + AMQPConnection_0_8Impl + conn = new AMQPConnection_0_8Impl(_broker, _network, _port, _transport, _protocol, 0, _ticker); conn.create(); conn.receiveProtocolHeader(new ProtocolInitiation(ProtocolVersion.v0_8)); @@ -188,8 +190,8 @@ public class AMQPConnection_0_8Test exte } { - AMQPConnection_0_8 - conn = new AMQPConnection_0_8(_broker, _network, _port, _transport, _protocol, 0, _ticker); + AMQPConnection_0_8Impl + conn = new AMQPConnection_0_8Impl(_broker, _network, _port, _transport, _protocol, 0, _ticker); conn.create(); conn.receiveProtocolHeader(new ProtocolInitiation(ProtocolVersion.v0_8)); @@ -203,8 +205,8 @@ public class AMQPConnection_0_8Test exte public void testConnectionEnforcesMaxSessions() throws Exception { - AMQPConnection_0_8 - conn = new AMQPConnection_0_8(_broker, _network, _port, _transport, _protocol, 0, _ticker); + AMQPConnection_0_8Impl + conn = new AMQPConnection_0_8Impl(_broker, _network, _port, _transport, _protocol, 0, _ticker); conn.create(); conn.receiveProtocolHeader(new ProtocolInitiation(ProtocolVersion.v0_8)); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java Sun May 22 21:03:46 2016 @@ -47,8 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.model.AuthenticationProvider; -import org.apache.qpid.server.model.State; -import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry; import org.apache.qpid.server.protocol.v1_0.codec.FrameWriter; import org.apache.qpid.server.protocol.v1_0.codec.ProtocolHandler; @@ -764,14 +763,14 @@ public class AMQPConnection_1_0 extends { long desiredIdleTimeout = getDesiredIdleTimeout(); initialiseHeartbeating(_idleTimeout / 2L, desiredIdleTimeout); - final VirtualHost vhost = ((AmqpPort) _port).getVirtualHost(_localHostname); - if (vhost == null) + final NamedAddressSpace addressSpace = ((AmqpPort) _port).getAddressSpace(_localHostname); + if (addressSpace == null) { closeWithError(AmqpError.NOT_FOUND, "Unknown hostname in connection open: '" + _localHostname + "'"); } else { - if (vhost.getState() != org.apache.qpid.server.model.State.ACTIVE) + if (!addressSpace.isActive()) { final Error err = new Error(); err.setCondition(AmqpError.NOT_FOUND); @@ -779,7 +778,7 @@ public class AMQPConnection_1_0 extends _closedOnOpen = true; - populateConnectionRedirect(vhost, err); + populateConnectionRedirect(addressSpace, err); closeConnection(err); @@ -803,7 +802,7 @@ public class AMQPConnection_1_0 extends { try { - setVirtualHost(vhost); + setAddressSpace(addressSpace); } catch (VirtualHostUnavailableException e) { @@ -826,9 +825,9 @@ public class AMQPConnection_1_0 extends } - private void populateConnectionRedirect(final VirtualHost vhost, final Error err) + private void populateConnectionRedirect(final NamedAddressSpace addressSpace, final Error err) { - final String redirectHost = vhost.getRedirectHost(((AmqpPort) _port)); + final String redirectHost = addressSpace.getRedirectHost(((AmqpPort) _port)); if(redirectHost == null) { @@ -1005,7 +1004,7 @@ public class AMQPConnection_1_0 extends } finally { - VirtualHost<?> virtualHost = getVirtualHost(); + NamedAddressSpace virtualHost = getAddressSpace(); if (virtualHost != null) { virtualHost.deregisterConnection(this); @@ -1206,7 +1205,7 @@ public class AMQPConnection_1_0 extends } catch (StoreException e) { - if (getVirtualHost().getState() == State.ACTIVE) + if (getAddressSpace().isActive()) { throw new ServerScopedRuntimeException(e); } @@ -1534,7 +1533,7 @@ public class AMQPConnection_1_0 extends @Override public String toString() { - VirtualHost<?> virtualHost = getVirtualHost(); + NamedAddressSpace virtualHost = getAddressSpace(); return "Connection_1_0[" + _connectionId + " " Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java Sun May 22 21:03:46 2016 @@ -120,7 +120,7 @@ class ConsumerTarget_1_0 extends Abstrac else { final MessageConverter converter = MessageConverterRegistry.getConverter(serverMessage.getClass(), Message_1_0.class); - message = (Message_1_0) converter.convert(serverMessage, _link.getVirtualHost()); + message = (Message_1_0) converter.convert(serverMessage, _link.getAddressSpace()); } Transfer transfer = new Transfer(); @@ -272,7 +272,7 @@ class ConsumerTarget_1_0 extends Abstrac getEndpoint().close(); final LinkRegistry linkReg = getSession().getConnection() - .getVirtualHost() + .getAddressSpace() .getLinkRegistry(getEndpoint().getSession().getConnection().getRemoteContainerId()); linkReg.unregisterSendingLink(getEndpoint().getName()); } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java Sun May 22 21:03:46 2016 @@ -30,6 +30,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder; import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoderImpl; import org.apache.qpid.server.protocol.v1_0.type.Binary; @@ -40,7 +41,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.messaging.Data; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.message.ServerMessage; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.store.StoredMessage; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; @@ -64,7 +64,7 @@ public abstract class MessageConverter_t } @Override - public final Message_1_0 convert(M message, VirtualHost<?> vhost) + public final Message_1_0 convert(M message, NamedAddressSpace addressSpace) { SectionEncoder sectionEncoder = new SectionEncoderImpl(_typeRegistry); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_Internal.java Sun May 22 21:03:46 2016 @@ -20,9 +20,9 @@ */ package org.apache.qpid.server.protocol.v1_0; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry; import org.apache.qpid.server.message.internal.InternalMessage; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; @@ -52,7 +52,7 @@ public class MessageConverter_v1_0_to_In } @Override - public InternalMessage convert(Message_1_0 serverMessage, VirtualHost<?> vhost) + public InternalMessage convert(Message_1_0 serverMessage, NamedAddressSpace addressSpace) { Object bodyObject = MessageConverter_from_1_0.convertBodyToObject(serverMessage); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java Sun May 22 21:03:46 2016 @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.messaging.SectionDecoderImpl; import org.apache.qpid.server.protocol.v1_0.type.Binary; import org.apache.qpid.server.protocol.v1_0.type.DeliveryState; @@ -41,7 +43,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.message.MessageReference; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.MessageHandle; import org.apache.qpid.server.store.StoredMessage; @@ -50,7 +51,7 @@ import org.apache.qpid.server.txn.Server public class ReceivingLink_1_0 implements ReceivingLinkListener, Link_1_0, DeliveryStateHandler { - private VirtualHost<?> _vhost; + private NamedAddressSpace _addressSpace; private ReceivingDestination _destination; private SectionDecoderImpl _sectionDecoder; @@ -66,10 +67,10 @@ public class ReceivingLink_1_0 implement private ReceiverSettleMode _receivingSettlementMode; - public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, VirtualHost<?> vhost, + public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, NamedAddressSpace addressSpace, ReceivingDestination destination) { - _vhost = vhost; + _addressSpace = addressSpace; _destination = destination; _attachment = receivingLinkAttachment; _receivingSettlementMode = receivingLinkAttachment.getEndpoint().getReceivingSettlementMode(); @@ -154,7 +155,7 @@ public class ReceivingLink_1_0 implement mmd = new MessageMetaData_1_0(fragments.toArray(new QpidByteBuffer[fragments.size()]), _sectionDecoder, immutableSections); - MessageHandle<MessageMetaData_1_0> handle = _vhost.getMessageStore().addMessage(mmd); + MessageHandle<MessageMetaData_1_0> handle = _addressSpace.getMessageStore().addMessage(mmd); for(QpidByteBuffer bareMessageBuf : immutableSections) { @@ -192,16 +193,16 @@ public class ReceivingLink_1_0 implement Session_1_0 session = getSession(); transaction = session != null ? session.getTransaction(null) - : new AutoCommitTransaction(_vhost.getMessageStore()); + : new AutoCommitTransaction(_addressSpace.getMessageStore()); } - final SecurityManager securityManager = _vhost.getSecurityManager(); + final SecurityManager securityManager = getSession().getConnection().getBroker().getSecurityManager(); try { securityManager.authorisePublish(false, _destination.getRoutingAddress(message), _destination.getAddress(), - _vhost.getName(), + _addressSpace.getName(), _attachment.getSession().getSubject(), message.getMessageHeader().getUserId(), _attachment.getSession().getAMQPConnection()); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Sun May 22 21:03:46 2016 @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentMa import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.server.protocol.v1_0.type.Binary; import org.apache.qpid.server.protocol.v1_0.type.DeliveryState; @@ -81,7 +82,7 @@ public class SendingLink_1_0 implements { private static final Logger _logger = LoggerFactory.getLogger(SendingLink_1_0.class); - private VirtualHost<?> _vhost; + private NamedAddressSpace _addressSpace; private SendingDestination _destination; private ConsumerImpl _consumer; @@ -102,11 +103,11 @@ public class SendingLink_1_0 implements public SendingLink_1_0(final SendingLinkAttachment linkAttachment, - final VirtualHost<?> vhost, + final NamedAddressSpace addressSpace, final SendingDestination destination) throws AmqpErrorException { - _vhost = vhost; + _addressSpace = addressSpace; _destination = destination; _linkAttachment = linkAttachment; final Source source = (Source) linkAttachment.getSource(); @@ -205,7 +206,7 @@ public class SendingLink_1_0 implements name = UUID.randomUUID().toString(); } - Queue<?> queue = _vhost.getAttainedChildFromAddress(Queue.class, name); + Queue<?> queue = getQueue(name); Exchange<?> exchange = exchangeDestination.getExchange(); if(queue == null) @@ -217,7 +218,7 @@ public class SendingLink_1_0 implements attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS); attributes.put(Queue.EXCLUSIVE, ExclusivityPolicy.LINK); - queue = _vhost.createChild(Queue.class, attributes); + queue = _addressSpace.createMessageSource(Queue.class, attributes); } else { @@ -615,7 +616,7 @@ public class SendingLink_1_0 implements if(outcome instanceof Accepted) { - AutoCommitTransaction txn = new AutoCommitTransaction(_vhost.getMessageStore()); + AutoCommitTransaction txn = new AutoCommitTransaction(_addressSpace.getMessageStore()); if(_consumer.acquires()) { if(queueEntry.acquire() || queueEntry.isAcquired()) @@ -637,7 +638,7 @@ public class SendingLink_1_0 implements } else if(outcome instanceof Released) { - AutoCommitTransaction txn = new AutoCommitTransaction(_vhost.getMessageStore()); + AutoCommitTransaction txn = new AutoCommitTransaction(_addressSpace.getMessageStore()); if(_consumer.acquires()) { txn.dequeue(Collections.singleton(queueEntry), @@ -686,9 +687,9 @@ public class SendingLink_1_0 implements _closeAction = action; } - public VirtualHost<?> getVirtualHost() + public NamedAddressSpace getAddressSpace() { - return _vhost; + return _addressSpace; } public ConsumerImpl getConsumer() @@ -700,4 +701,10 @@ public class SendingLink_1_0 implements { return _target; } + + private Queue<?> getQueue(String name) + { + MessageSource source = getAddressSpace().getAttainedMessageSource(name); + return source instanceof Queue ? (Queue<?>) source : null; + } } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Sun May 22 21:03:46 2016 @@ -45,6 +45,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.bytebuffer.QpidByteBuffer; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.framing.OversizeFrameException; import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.server.protocol.v1_0.type.Binary; @@ -87,7 +88,6 @@ import org.apache.qpid.server.model.Cons import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.Session; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.ConsumerListener; import org.apache.qpid.server.protocol.LinkRegistry; @@ -715,7 +715,7 @@ public class Session_1_0 implements AMQS Link_1_0 link = null; Error error = null; - final LinkRegistry linkRegistry = getVirtualHost().getLinkRegistry(getConnection().getRemoteContainerId()); + final LinkRegistry linkRegistry = getAddressSpace().getLinkRegistry(getConnection().getRemoteContainerId()); if (endpoint.getRole() == Role.SENDER) @@ -742,8 +742,7 @@ public class Session_1_0 implements AMQS if (!addr.startsWith("/") && addr.contains("/")) { String[] parts = addr.split("/", 2); - Exchange<?> exchg = - getVirtualHost().getAttainedChildFromAddress(Exchange.class, parts[0]); + Exchange<?> exchg = getExchange(parts[0]); if (exchg != null) { ExchangeDestination exchangeDestination = @@ -763,15 +762,14 @@ public class Session_1_0 implements AMQS } else { - MessageSource queue = getVirtualHost().getAttainedMessageSource(addr); + MessageSource queue = getAddressSpace().getAttainedMessageSource(addr); if (queue != null) { destination = new MessageSourceDestination(queue); } else { - Exchange<?> exchg = - getVirtualHost().getAttainedChildFromAddress(Exchange.class, addr); + Exchange<?> exchg = getExchange(addr); if (exchg != null) { destination = new ExchangeDestination(exchg, @@ -800,7 +798,7 @@ public class Session_1_0 implements AMQS { final SendingLink_1_0 sendingLink = new SendingLink_1_0(new SendingLinkAttachment(this, sendingLinkEndpoint), - getVirtualHost(), + getAddressSpace(), (SendingDestination) destination ); @@ -885,7 +883,7 @@ public class Session_1_0 implements AMQS final ReceivingLinkEndpoint receivingLinkEndpoint = (ReceivingLinkEndpoint) endpoint; final TxnCoordinatorLink_1_0 coordinatorLink = - new TxnCoordinatorLink_1_0(getVirtualHost(), + new TxnCoordinatorLink_1_0(getAddressSpace(), this, receivingLinkEndpoint, _openTransactions); @@ -918,15 +916,14 @@ public class Session_1_0 implements AMQS String addr = target.getAddress(); if (addr == null || "".equals(addr.trim())) { - MessageDestination messageDestination = getVirtualHost().getDefaultDestination(); + MessageDestination messageDestination = getAddressSpace().getDefaultDestination(); destination = new NodeReceivingDestination(messageDestination, target.getDurable(), target.getExpiryPolicy(), ""); } else if (!addr.startsWith("/") && addr.contains("/")) { String[] parts = addr.split("/", 2); - Exchange<?> exchange = - getVirtualHost().getAttainedChildFromAddress(Exchange.class, parts[0]); + Exchange<?> exchange =getExchange(parts[0]); if (exchange != null) { ExchangeDestination exchangeDestination = @@ -949,7 +946,7 @@ public class Session_1_0 implements AMQS else { MessageDestination messageDestination = - getVirtualHost().getAttainedMessageDestination(addr); + getAddressSpace().getAttainedMessageDestination(addr); if (messageDestination != null) { destination = @@ -958,8 +955,7 @@ public class Session_1_0 implements AMQS } else { - Queue<?> queue = - getVirtualHost().getAttainedChildFromAddress(Queue.class, addr); + Queue<?> queue = getQueue(addr); if (queue != null) { @@ -984,7 +980,7 @@ public class Session_1_0 implements AMQS final ReceivingLinkEndpoint receivingLinkEndpoint = (ReceivingLinkEndpoint) endpoint; final ReceivingLink_1_0 receivingLink = new ReceivingLink_1_0(new ReceivingLinkAttachment(this, receivingLinkEndpoint), - getVirtualHost(), + getAddressSpace(), (ReceivingDestination) destination); receivingLinkEndpoint.setLinkEventListener(new SubjectSpecificReceivingLinkListener( @@ -1085,7 +1081,7 @@ public class Session_1_0 implements AMQS // TODO convert AMQP 1-0 node properties to queue attributes - queue = getVirtualHost().createChild(Queue.class, attributes); + queue = getAddressSpace().createMessageSource(Queue.class, attributes); } catch (AccessControlException e) { @@ -1112,7 +1108,7 @@ public class Session_1_0 implements AMQS { if(_transaction == null) { - _transaction = new AutoCommitTransaction(_connection.getVirtualHost().getMessageStore()); + _transaction = new AutoCommitTransaction(_connection.getAddressSpace().getMessageStore()); } transaction = _transaction; } @@ -1351,7 +1347,7 @@ public class Session_1_0 implements AMQS connectionId, authorizedPrincipal, remoteAddress, - getVirtualHost().getName(), + getAddressSpace().getName(), _sendingChannel) + "] "; } @@ -1386,9 +1382,9 @@ public class Session_1_0 implements AMQS return _subject; } - private VirtualHost<?> getVirtualHost() + private NamedAddressSpace getAddressSpace() { - return _connection.getVirtualHost(); + return _connection.getAddressSpace(); } @@ -1706,4 +1702,17 @@ public class Session_1_0 implements AMQS throw new RuntimeException(); } + + private Exchange<?> getExchange(String name) + { + MessageDestination destination = getAddressSpace().getAttainedMessageDestination(name); + return destination instanceof Exchange ? (Exchange<?>) destination : null; + } + + private Queue<?> getQueue(String name) + { + MessageSource source = getAddressSpace().getAttainedMessageSource(name); + return source instanceof Queue ? (Queue<?>) source : null; + } + } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java Sun May 22 21:03:46 2016 @@ -28,6 +28,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.protocol.v1_0.messaging.SectionDecoder; import org.apache.qpid.server.protocol.v1_0.messaging.SectionDecoderImpl; import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; @@ -44,14 +45,13 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; import org.apache.qpid.bytebuffer.QpidByteBuffer; -import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.txn.LocalTransaction; import org.apache.qpid.server.txn.ServerTransaction; public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0 { private static final Logger _logger = LoggerFactory.getLogger(TxnCoordinatorLink_1_0.class); - private VirtualHost<?> _vhost; + private NamedAddressSpace _namedAddressSpace; private ReceivingLinkEndpoint _endpoint; private ArrayList<Transfer> _incompleteMessage; @@ -60,11 +60,11 @@ public class TxnCoordinatorLink_1_0 impl private Session_1_0 _session; - public TxnCoordinatorLink_1_0(VirtualHost<?> vhost, + public TxnCoordinatorLink_1_0(NamedAddressSpace namedAddressSpace, Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint, LinkedHashMap<Integer, ServerTransaction> openTransactions) { - _vhost = vhost; + _namedAddressSpace = namedAddressSpace; _session = session_1_0; _endpoint = endpoint; _sectionDecoder = new SectionDecoderImpl(endpoint.getSession().getConnection().getDescribedTypeRegistry()); @@ -136,7 +136,7 @@ public class TxnCoordinatorLink_1_0 impl } txnId = Integer.valueOf(txnId.intValue() + 1); - _openTransactions.put(txnId, new LocalTransaction(_vhost.getMessageStore())); + _openTransactions.put(txnId, new LocalTransaction(_namedAddressSpace.getMessageStore())); Declared state = new Declared(); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java Sun May 22 21:03:46 2016 @@ -106,6 +106,8 @@ public class ProtocolEngine_1_0_0Test ex when(_virtualHost.getChildExecutor()).thenReturn(taskExecutor); when(_virtualHost.getModel()).thenReturn(BrokerModel.getInstance()); when(_virtualHost.getState()).thenReturn(State.ACTIVE); + when(_virtualHost.isActive()).thenReturn(true); + final ArgumentCaptor<AMQPConnection> connectionCaptor = ArgumentCaptor.forClass(AMQPConnection.class); doAnswer(new Answer() { @@ -117,7 +119,7 @@ public class ProtocolEngine_1_0_0Test ex } }).when(_virtualHost).registerConnection(connectionCaptor.capture()); when(_virtualHost.getPrincipal()).thenReturn(mock(VirtualHostPrincipal.class)); - when(_port.getVirtualHost(anyString())).thenReturn(_virtualHost); + when(_port.getAddressSpace(anyString())).thenReturn(_virtualHost); when(_authenticationProvider.getSubjectCreator(anyBoolean())).thenReturn(_subjectCreator); final ArgumentCaptor<Principal> userCaptor = ArgumentCaptor.forClass(Principal.class); Modified: qpid/java/trunk/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 URL: http://svn.apache.org/viewvc/qpid/java/trunk/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?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/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 (original) +++ qpid/java/trunk/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 Sun May 22 21:03:46 2016 @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.qpid.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.model.Exchange; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; @@ -58,20 +59,20 @@ public class MessageConverter_1_0_to_v0_ } @Override - public MessageTransferMessage convert(Message_1_0 serverMsg, VirtualHost<?> vhost) + public MessageTransferMessage convert(Message_1_0 serverMsg, NamedAddressSpace addressSpace) { - return new MessageTransferMessage(convertToStoredMessage(serverMsg, vhost), null); + return new MessageTransferMessage(convertToStoredMessage(serverMsg, addressSpace), null); } private StoredMessage<MessageMetaData_0_10> convertToStoredMessage(final Message_1_0 serverMsg, - final VirtualHost<?> vhost) + final NamedAddressSpace addressSpace) { Object bodyObject = MessageConverter_from_1_0.convertBodyToObject(serverMsg); final byte[] messageContent = MessageConverter_from_1_0.convertToBody(bodyObject); final MessageMetaData_0_10 messageMetaData_0_10 = convertMetaData(serverMsg, - vhost, + addressSpace, MessageConverter_from_1_0.getBodyMimeType(bodyObject), messageContent.length); @@ -116,7 +117,7 @@ public class MessageConverter_1_0_to_v0_ } private MessageMetaData_0_10 convertMetaData(Message_1_0 serverMsg, - final VirtualHost<?> vhost, + final NamedAddressSpace addressSpace, final String bodyMimeType, final int size) { @@ -151,7 +152,7 @@ public class MessageConverter_1_0_to_v0_ String[] parts = origReplyTo.split("/",2); replyTo = new ReplyTo(parts[0],parts[1]); } - else if(vhost.getAttainedChildFromAddress(Exchange.class, origReplyTo) != null) + else if(addressSpace.getAttainedMessageDestination(origReplyTo) instanceof Exchange) { replyTo = new ReplyTo(origReplyTo,""); } Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java Sun May 22 21:03:46 2016 @@ -32,7 +32,9 @@ import org.apache.qpid.framing.BasicCont import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.MessagePublishInfo; +import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.model.Exchange; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; @@ -52,7 +54,7 @@ public class MessageConverter_0_10_to_0_ private static final int BASIC_CLASS_ID = 60; public static BasicContentHeaderProperties convertContentHeaderProperties(MessageTransferMessage messageTransferMessage, - VirtualHost<?> vhost) + NamedAddressSpace addressSpace) { BasicContentHeaderProperties props = new BasicContentHeaderProperties(); @@ -113,7 +115,9 @@ public class MessageConverter_0_10_to_0_ exchangeName = ""; } - Exchange<?> exchange = vhost.getAttainedChildFromAddress(Exchange.class, exchangeName); + MessageDestination destination = addressSpace.getAttainedMessageDestination(exchangeName); + Exchange<?> exchange = destination instanceof Exchange ? (Exchange<?>) destination : null; + String exchangeClass = exchange == null ? ExchangeDefaults.DIRECT_EXCHANGE_CLASS : exchange.getType(); @@ -169,15 +173,15 @@ public class MessageConverter_0_10_to_0_ } @Override - public AMQMessage convert(MessageTransferMessage message, VirtualHost<?> vhost) + public AMQMessage convert(MessageTransferMessage message, NamedAddressSpace addressSpace) { - return new AMQMessage(convertToStoredMessage(message, vhost)); + return new AMQMessage(convertToStoredMessage(message, addressSpace)); } private StoredMessage<MessageMetaData> convertToStoredMessage(final MessageTransferMessage message, - VirtualHost<?> vhost) + NamedAddressSpace addressSpace) { - final MessageMetaData metaData = convertMetaData(message, vhost); + final MessageMetaData metaData = convertMetaData(message, addressSpace); return new StoredMessage<org.apache.qpid.server.protocol.v0_8.MessageMetaData>() { @Override @@ -218,16 +222,16 @@ public class MessageConverter_0_10_to_0_ }; } - private MessageMetaData convertMetaData(MessageTransferMessage message, VirtualHost<?> vhost) + private MessageMetaData convertMetaData(MessageTransferMessage message, NamedAddressSpace addressSpace) { return new MessageMetaData(convertPublishBody(message), - convertContentHeaderBody(message, vhost), + convertContentHeaderBody(message, addressSpace), message.getArrivalTime()); } - private ContentHeaderBody convertContentHeaderBody(MessageTransferMessage message, VirtualHost<?> vhost) + private ContentHeaderBody convertContentHeaderBody(MessageTransferMessage message, NamedAddressSpace addressSpace) { - BasicContentHeaderProperties props = convertContentHeaderProperties(message, vhost); + BasicContentHeaderProperties props = convertContentHeaderProperties(message, addressSpace); ContentHeaderBody chb = new ContentHeaderBody(props); chb.setBodySize(message.getSize()); return chb; Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java Sun May 22 21:03:46 2016 @@ -29,7 +29,7 @@ import org.apache.qpid.bytebuffer.QpidBy import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.FieldTable; -import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; @@ -59,7 +59,7 @@ public class MessageConverter_0_8_to_0_1 } @Override - public MessageTransferMessage convert(AMQMessage message_0_8, VirtualHost<?> vhost) + public MessageTransferMessage convert(AMQMessage message_0_8, NamedAddressSpace addressSpace) { return new MessageTransferMessage(convertToStoredMessage(message_0_8), null); } Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java Sun May 22 21:03:46 2016 @@ -31,7 +31,7 @@ import org.apache.qpid.framing.BasicCont import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.MessagePublishInfo; -import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_8.AMQMessage; @@ -59,7 +59,7 @@ public class MessageConverter_1_0_to_v0_ } @Override - public AMQMessage convert(Message_1_0 serverMsg, VirtualHost<?> vhost) + public AMQMessage convert(Message_1_0 serverMsg, NamedAddressSpace addressSpace) { return new AMQMessage(convertToStoredMessage(serverMsg), null); } Modified: qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyMessageStoreQuotaEventsTest.java Sun May 22 21:03:46 2016 @@ -54,7 +54,7 @@ public class DerbyMessageStoreQuotaEvent { final DerbyVirtualHost parent = mock(DerbyVirtualHost.class); when(parent.getContext()).thenReturn(createContextSettings()); - when(parent.getContextKeys(false)).thenReturn(Collections.emptySet()); + when(parent.getContextKeys(false)).thenReturn(Collections.<String>emptySet()); when(parent.getStorePath()).thenReturn(storeLocation); when(parent.getStoreOverfullSize()).thenReturn(OVERFULL_SIZE); when(parent.getStoreUnderfullSize()).thenReturn(UNDERFULL_SIZE); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Sun May 22 21:03:46 2016 @@ -36,6 +36,7 @@ import java.util.TreeMap; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectAttribute; import org.apache.qpid.server.model.Model; +import org.apache.qpid.server.model.Named; public class ConfiguredObjectToMapConverter { @@ -139,6 +140,10 @@ public class ConfiguredObjectToMapConver } object.put(name, converted); } + else if (value instanceof Named) + { + object.put(name, ((Named) value).getName()); + } else if (value != null) { ConfiguredObjectAttribute<?, ?> attribute = confObject.getModel() Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java?rev=1745091&r1=1745090&r2=1745091&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Sun May 22 21:03:46 2016 @@ -207,7 +207,7 @@ public class MetaDataServlet extends Abs Collection<Object> convertedValues = new ArrayList<>(validValues.size()); for (String value : validValues) { - convertedValues.add(attribute.convert(value, null)); + convertedValues.add(((ConfiguredSettableAttribute<?, ?>) attribute).convert(value, null)); } attrDetails.put("validValues", convertedValues); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
