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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -75,25 +75,25 @@ import org.apache.qpid.protocol.AMQConst import org.apache.qpid.server.connection.SessionPrincipal; import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.consumer.ConsumerTarget; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.ConfigurationChangeListener; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Consumer; +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; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.transport.AMQPConnection; import org.apache.qpid.server.txn.AutoCommitTransaction; import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.apache.qpid.server.virtualhost.QueueExistsException; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.network.Ticker; public class Session_1_0 implements SessionEventListener, AMQSessionModel<Session_1_0>, LogSubject @@ -165,14 +165,14 @@ public class Session_1_0 implements Sess { if(Boolean.TRUE.equals(source.getDynamic())) { - AMQQueue tempQueue = createTemporaryQueue(source.getDynamicNodeProperties()); + Queue<?> tempQueue = createTemporaryQueue(source.getDynamicNodeProperties()); source.setAddress(tempQueue.getName()); } String addr = source.getAddress(); if(!addr.startsWith("/") && addr.contains("/")) { String[] parts = addr.split("/",2); - ExchangeImpl exchg = getVirtualHost().getAttainedExchange(parts[0]); + Exchange<?> exchg = getVirtualHost().getAttainedExchange(parts[0]); if(exchg != null) { ExchangeDestination exchangeDestination = @@ -196,7 +196,7 @@ public class Session_1_0 implements Sess } else { - ExchangeImpl exchg = getVirtualHost().getAttainedExchange(addr); + Exchange<?> exchg = getVirtualHost().getAttainedExchange(addr); if(exchg != null) { destination = new ExchangeDestination(exchg, source.getDurable(), source.getExpiryPolicy()); @@ -326,7 +326,7 @@ public class Session_1_0 implements Sess if(Boolean.TRUE.equals(target.getDynamic())) { - AMQQueue tempQueue = createTemporaryQueue(target.getDynamicNodeProperties()); + Queue<?> tempQueue = createTemporaryQueue(target.getDynamicNodeProperties()); target.setAddress(tempQueue.getName()); } @@ -340,7 +340,7 @@ public class Session_1_0 implements Sess else if(!addr.startsWith("/") && addr.contains("/")) { String[] parts = addr.split("/",2); - ExchangeImpl exchange = getVirtualHost().getAttainedExchange(parts[0]); + Exchange<?> exchange = getVirtualHost().getAttainedExchange(parts[0]); if(exchange != null) { ExchangeDestination exchangeDestination = @@ -369,7 +369,7 @@ public class Session_1_0 implements Sess } else { - AMQQueue queue = getVirtualHost().getAttainedQueue(addr); + Queue<?> queue = getVirtualHost().getAttainedQueue(addr); if(queue != null) { @@ -449,10 +449,10 @@ public class Session_1_0 implements Sess } - private AMQQueue createTemporaryQueue(Map properties) + private Queue<?> createTemporaryQueue(Map properties) { final String queueName = UUID.randomUUID().toString(); - AMQQueue queue = null; + Queue<?> queue = null; try { LifetimePolicy lifetimePolicy = properties == null @@ -666,13 +666,13 @@ public class Session_1_0 implements Sess } @Override - public void block(AMQQueue queue) + public void block(Queue<?> queue) { // TODO - required for AMQSessionModel / producer side flow control } @Override - public void unblock(AMQQueue queue) + public void unblock(Queue<?> queue) { // TODO - required for AMQSessionModel / producer side flow control } @@ -797,7 +797,7 @@ public class Session_1_0 implements Sess return _subject; } - VirtualHostImpl getVirtualHost() + VirtualHost<?> getVirtualHost() { return _connection.getVirtualHost(); }
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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -47,14 +47,14 @@ import org.apache.qpid.amqp_1_0.type.tra import org.apache.qpid.amqp_1_0.type.transport.Error; import org.apache.qpid.amqp_1_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; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0 { private static final Logger _logger = LoggerFactory.getLogger(TxnCoordinatorLink_1_0.class); - private VirtualHostImpl _vhost; + private VirtualHost<?> _vhost; private ReceivingLinkEndpoint _endpoint; private ArrayList<Transfer> _incompleteMessage; @@ -63,7 +63,7 @@ public class TxnCoordinatorLink_1_0 impl private Session_1_0 _session; - public TxnCoordinatorLink_1_0(VirtualHostImpl vhost, + public TxnCoordinatorLink_1_0(VirtualHost<?> vhost, Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint, LinkedHashMap<Integer, ServerTransaction> openTransactions) { 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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -65,7 +65,6 @@ import org.apache.qpid.server.security.a import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager; import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory; import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManagerImpl; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.ByteBufferSender; import org.apache.qpid.transport.network.AggregateTicker; @@ -81,7 +80,7 @@ public class ProtocolEngine_1_0_0Test ex private List<ByteBuffer> _sentBuffers; private FrameWriter _frameWriter; private AMQPConnection _connection; - private VirtualHostImpl _virtualHost; + private VirtualHost<?> _virtualHost; @Override public void setUp() throws Exception @@ -103,7 +102,7 @@ public class ProtocolEngine_1_0_0Test ex _subjectCreator = mock(SubjectCreator.class); _authenticationProvider = mock(AuthenticationProvider.class); when(_port.getAuthenticationProvider()).thenReturn(_authenticationProvider); - _virtualHost = mock(VirtualHostImpl.class); + _virtualHost = mock(VirtualHost.class); when(_virtualHost.getChildExecutor()).thenReturn(taskExecutor); when(_virtualHost.getModel()).thenReturn(BrokerModel.getInstance()); final ArgumentCaptor<AMQPConnection> connectionCaptor = ArgumentCaptor.forClass(AMQPConnection.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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -27,6 +27,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.qpid.bytebuffer.QpidByteBuffer; +import org.apache.qpid.server.model.VirtualHost; 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; @@ -35,7 +36,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.MessageMetaData_1_0; import org.apache.qpid.server.protocol.v1_0.Message_1_0; import org.apache.qpid.server.store.StoredMessage; -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; @@ -58,13 +58,13 @@ public class MessageConverter_1_0_to_v0_ } @Override - public MessageTransferMessage convert(Message_1_0 serverMsg, VirtualHostImpl vhost) + public MessageTransferMessage convert(Message_1_0 serverMsg, VirtualHost<?> vhost) { return new MessageTransferMessage(convertToStoredMessage(serverMsg, vhost), null); } private StoredMessage<MessageMetaData_0_10> convertToStoredMessage(final Message_1_0 serverMsg, - final VirtualHostImpl vhost) + final VirtualHost<?> vhost) { Object bodyObject = MessageConverter_from_1_0.convertBodyToObject(serverMsg); @@ -128,7 +128,7 @@ public class MessageConverter_1_0_to_v0_ } private MessageMetaData_0_10 convertMetaData(Message_1_0 serverMsg, - final VirtualHostImpl vhost, + final VirtualHost<?> vhost, final String bodyMimeType, final int size) { 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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -33,14 +33,14 @@ 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.exchange.ExchangeImpl; +import org.apache.qpid.server.model.Exchange; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v0_8.MessageMetaData; import org.apache.qpid.server.store.StoredMessage; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.Header; import org.apache.qpid.transport.MessageDeliveryMode; @@ -53,7 +53,7 @@ public class MessageConverter_0_10_to_0_ private static final int BASIC_CLASS_ID = 60; public static BasicContentHeaderProperties convertContentHeaderProperties(MessageTransferMessage messageTransferMessage, - VirtualHostImpl vhost) + VirtualHost<?> vhost) { BasicContentHeaderProperties props = new BasicContentHeaderProperties(); @@ -114,7 +114,7 @@ public class MessageConverter_0_10_to_0_ exchangeName = ""; } - ExchangeImpl exchange = vhost.getAttainedExchange(exchangeName); + Exchange<?> exchange = vhost.getAttainedExchange(exchangeName); String exchangeClass = exchange == null ? ExchangeDefaults.DIRECT_EXCHANGE_CLASS : exchange.getType(); @@ -170,13 +170,13 @@ public class MessageConverter_0_10_to_0_ } @Override - public AMQMessage convert(MessageTransferMessage message, VirtualHostImpl vhost) + public AMQMessage convert(MessageTransferMessage message, VirtualHost<?> vhost) { return new AMQMessage(convertToStoredMessage(message, vhost)); } private StoredMessage<MessageMetaData> convertToStoredMessage(final MessageTransferMessage message, - VirtualHostImpl vhost) + VirtualHost<?> vhost) { final MessageMetaData metaData = convertMetaData(message, vhost); return new StoredMessage<org.apache.qpid.server.protocol.v0_8.MessageMetaData>() @@ -225,14 +225,14 @@ public class MessageConverter_0_10_to_0_ }; } - private MessageMetaData convertMetaData(MessageTransferMessage message, VirtualHostImpl vhost) + private MessageMetaData convertMetaData(MessageTransferMessage message, VirtualHost<?> vhost) { return new MessageMetaData(convertPublishBody(message), convertContentHeaderBody(message, vhost), message.getArrivalTime()); } - private ContentHeaderBody convertContentHeaderBody(MessageTransferMessage message, VirtualHostImpl vhost) + private ContentHeaderBody convertContentHeaderBody(MessageTransferMessage message, VirtualHost<?> vhost) { BasicContentHeaderProperties props = convertContentHeaderProperties(message, vhost); ContentHeaderBody chb = new ContentHeaderBody(props); 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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -30,13 +30,13 @@ 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.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10; import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.store.StoredMessage; -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; @@ -60,7 +60,7 @@ public class MessageConverter_0_8_to_0_1 } @Override - public MessageTransferMessage convert(AMQMessage message_0_8, VirtualHostImpl vhost) + public MessageTransferMessage convert(AMQMessage message_0_8, VirtualHost<?> vhost) { 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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015 @@ -32,6 +32,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.plugin.MessageConverter; import org.apache.qpid.server.plugin.PluggableService; import org.apache.qpid.server.protocol.v0_8.AMQMessage; @@ -40,7 +41,6 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.MessageMetaData_1_0; import org.apache.qpid.server.protocol.v1_0.Message_1_0; import org.apache.qpid.server.store.StoredMessage; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; @PluggableService public class MessageConverter_1_0_to_v0_8 implements MessageConverter<Message_1_0, AMQMessage> @@ -60,7 +60,7 @@ public class MessageConverter_1_0_to_v0_ } @Override - public AMQMessage convert(Message_1_0 serverMsg, VirtualHostImpl vhost) + public AMQMessage convert(Message_1_0 serverMsg, VirtualHost<?> vhost) { return new AMQMessage(convertToStoredMessage(serverMsg), null); } Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -19,13 +19,11 @@ package org.apache.qpid.server.virtualhost.derby; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; -import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.SizeMonitoringSettings; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; -public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>, org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings +public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends VirtualHost<X>, org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings { String STORE_PATH = "storePath"; Modified: qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java (original) +++ qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -19,15 +19,13 @@ package org.apache.qpid.server.virtualhost.jdbc; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; -import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.jdbc.DefaultConnectionProviderFactory; import org.apache.qpid.server.store.jdbc.JDBCSettings; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; -public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, - JDBCSettings +public interface JDBCVirtualHost<X extends JDBCVirtualHost<X>> extends VirtualHost<X>, + JDBCSettings { @ManagedAttribute(mandatory=true) String getConnectionUrl(); Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original) +++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri Dec 11 15:50:19 2015 @@ -53,6 +53,7 @@ import org.apache.qpid.server.model.Conf import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.State; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageConverter; import org.apache.qpid.server.plugin.SystemNodeCreator; import org.apache.qpid.server.protocol.AMQSessionModel; @@ -65,7 +66,6 @@ import org.apache.qpid.server.txn.AutoCo import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.StateChangeListener; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; class ManagementNode implements MessageSource, MessageDestination { @@ -102,7 +102,7 @@ class ManagementNode implements MessageS public static final String RESULTS = "results"; - private final VirtualHostImpl _virtualHost; + private final VirtualHost<?> _virtualHost; private final UUID _id; Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.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/QueueReportServlet.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueueReportServlet.java Fri Dec 11 15:50:19 2015 @@ -70,7 +70,7 @@ public class QueueReportServlet extends String vhostName = pathInfoElements[0]; String queueName = pathInfoElements[1]; - VirtualHost<?,?,?> vhost = getBroker().findVirtualHostByName(vhostName); + VirtualHost<?> vhost = getBroker().findVirtualHostByName(vhostName); if (vhost == null) { throw new IllegalArgumentException("Could not find virtual host with name '" + vhostName + "'"); @@ -84,7 +84,7 @@ public class QueueReportServlet extends return queueFromVirtualHost; } - private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?,?,?> vhost) + private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost) { Queue queue = null; Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java (original) +++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java Fri Dec 11 15:50:19 2015 @@ -38,7 +38,6 @@ import org.mockito.stubbing.Answer; import org.apache.qpid.server.message.AMQMessageHeader; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.Queue; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.queue.QueueEntryVisitor; import org.apache.qpid.test.utils.QpidTestCase; @@ -164,7 +163,7 @@ public class ReportRunnerTest extends Qp private Queue createMockQueue(final ServerMessage<?>... messages) { - final AMQQueue queue = mock(AMQQueue.class); + final Queue<?> queue = mock(Queue.class); final ArgumentCaptor<QueueEntryVisitor> captor = ArgumentCaptor.forClass(QueueEntryVisitor.class); doAnswer(new Answer() { @@ -185,7 +184,7 @@ public class ReportRunnerTest extends Qp return queue; } - private QueueEntry makeEntry(final AMQQueue queue, final ServerMessage<?> message) + private QueueEntry makeEntry(final Queue queue, final ServerMessage<?> message) { QueueEntry entry = mock(QueueEntry.class); when(entry.getQueue()).thenReturn(queue); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri Dec 11 15:50:19 2015 @@ -45,7 +45,6 @@ import org.apache.qpid.framing.MessagePu import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; import org.apache.qpid.server.connection.SessionPrincipal; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.Binding; @@ -63,7 +62,6 @@ import org.apache.qpid.server.model.Virt import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v0_8.MessageMetaData; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.LastValueQueue; import org.apache.qpid.server.queue.LastValueQueueImpl; import org.apache.qpid.server.queue.PriorityQueue; @@ -74,7 +72,6 @@ import org.apache.qpid.server.txn.AutoCo import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.test.utils.QpidTestCase; @@ -116,7 +113,7 @@ public class VirtualHostMessageStoreTest private String queueOwner = "MST"; - private VirtualHostImpl<?,?,?> _virtualHost; + private VirtualHost<?> _virtualHost; private String _storePath; private VirtualHostNode<?> _node; private TaskExecutor _taskExecutor; @@ -159,7 +156,7 @@ public class VirtualHostMessageStoreTest virtualHostAttributes.putAll(attrs); _node.createChild(VirtualHost.class, virtualHostAttributes, _node); - _virtualHost = (VirtualHostImpl<?,?,?>)_node.getVirtualHost(); + _virtualHost = (VirtualHost<?>)_node.getVirtualHost(); } @@ -191,7 +188,7 @@ public class VirtualHostMessageStoreTest _node.start(); currentState = _node.getState(); assertEquals("Virtual host node is not active", State.ACTIVE, currentState); - _virtualHost = (VirtualHostImpl<?, ?, ?>) _node.getVirtualHost(); + _virtualHost = _node.getVirtualHost(); } public void testQueueExchangeAndBindingCreation() throws Exception @@ -202,15 +199,17 @@ public class VirtualHostMessageStoreTest createAllTopicQueues(); //Register Non-Durable DirectExchange - ExchangeImpl<?> nonDurableExchange = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, nonDurableExchangeName, false); + Exchange<?> nonDurableExchange = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, nonDurableExchangeName, false); bindAllQueuesToExchange(nonDurableExchange, directRouting); //Register DirectExchange - ExchangeImpl<?> directExchange = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, directExchangeName, true); + Exchange<?> + directExchange = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, directExchangeName, true); bindAllQueuesToExchange(directExchange, directRouting); //Register TopicExchange - ExchangeImpl<?> topicExchange = createExchange(ExchangeDefaults.TOPIC_EXCHANGE_CLASS, topicExchangeName, true); + Exchange<?> + topicExchange = createExchange(ExchangeDefaults.TOPIC_EXCHANGE_CLASS, topicExchangeName, true); bindAllTopicQueuesToExchange(topicExchange, topicRouting); //Send Message To NonDurable direct Exchange = persistent @@ -350,7 +349,7 @@ public class VirtualHostMessageStoreTest { int origExchangeCount = _virtualHost.getExchanges().size(); - Map<String, ExchangeImpl<?>> oldExchanges = createExchanges(); + Map<String, Exchange<?>> oldExchanges = createExchanges(); assertEquals("Incorrect number of exchanges registered before recovery", origExchangeCount + 3, _virtualHost.getExchanges().size()); @@ -382,8 +381,8 @@ public class VirtualHostMessageStoreTest //test that removing the exchange means it is not recovered next time - final ExchangeImpl<?> exchange = - (ExchangeImpl<?>) _virtualHost.getChildByName(Exchange.class, directExchangeName); + final Exchange<?> exchange = + (Exchange<?>) _virtualHost.getChildByName(Exchange.class, directExchangeName); _virtualHost.getDurableConfigurationStore().remove(exchange.asObjectRecord()); reloadVirtualHost(); @@ -407,11 +406,11 @@ public class VirtualHostMessageStoreTest createAllQueues(); createAllTopicQueues(); - Map<String, ExchangeImpl<?>> exchanges = createExchanges(); + Map<String, Exchange<?>> exchanges = createExchanges(); - ExchangeImpl<?> nonDurableExchange = exchanges.get(nonDurableExchangeName); - ExchangeImpl<?> directExchange = exchanges.get(directExchangeName); - ExchangeImpl<?> topicExchange = exchanges.get(topicExchangeName); + Exchange<?> nonDurableExchange = exchanges.get(nonDurableExchangeName); + Exchange<?> directExchange = exchanges.get(directExchangeName); + Exchange<?> topicExchange = exchanges.get(topicExchangeName); bindAllQueuesToExchange(nonDurableExchange, directRouting); bindAllQueuesToExchange(directExchange, directRouting); @@ -435,7 +434,8 @@ public class VirtualHostMessageStoreTest public void testDurableBindingRemoval() throws Exception { //create durable queue and exchange, bind them - ExchangeImpl<?> exch = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, directExchangeName, true); + Exchange<?> + exch = createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, directExchangeName, true); createQueue(durableQueueName, false, true, false, false); bindQueueToExchange(exch, directRouting, _virtualHost.getChildByName(Queue.class, durableQueueName), false); @@ -448,12 +448,12 @@ public class VirtualHostMessageStoreTest assertEquals("Incorrect number of bindings registered after first recovery", 1, _virtualHost.getChildByName(Queue.class, durableQueueName).getBindings().size()); - exch = (ExchangeImpl<?>) _virtualHost.getChildByName(Exchange.class, directExchangeName); + exch = (Exchange<?>) _virtualHost.getChildByName(Exchange.class, directExchangeName); assertNotNull("Exchange was not recovered", exch); //remove the binding and verify result after recovery unbindQueueFromExchange(exch, directRouting, - (AMQQueue<?>) _virtualHost.getChildByName(Queue.class, durableQueueName), false); + (Queue<?>) _virtualHost.getChildByName(Queue.class, durableQueueName), false); reloadVirtualHost(); @@ -466,11 +466,11 @@ public class VirtualHostMessageStoreTest * and that the new exchanges are not the same objects as the provided list (i.e. that the * reload actually generated new exchange objects) */ - private void validateExchanges(int originalNumExchanges, Map<String, ExchangeImpl<?>> oldExchanges) + private void validateExchanges(int originalNumExchanges, Map<String, Exchange<?>> oldExchanges) { - Collection<ExchangeImpl<?>> exchanges = (Collection<ExchangeImpl<?>>) _virtualHost.getExchanges(); + Collection<Exchange<?>> exchanges = _virtualHost.getExchanges(); Collection<String> exchangeNames = new ArrayList<String>(exchanges.size()); - for(ExchangeImpl<?> exchange : exchanges) + for(Exchange<?> exchange : exchanges) { exchangeNames.add(exchange.getName()); } @@ -530,7 +530,7 @@ public class VirtualHostMessageStoreTest private void setQueueExclusivity(boolean exclusive) throws MessageSource.ExistingConsumerPreventsExclusive { - AMQQueue<?> queue = (AMQQueue<?>) _virtualHost.getChildByName(Queue.class, durableExclusiveQueueName); + Queue<?> queue = (Queue<?>) _virtualHost.getChildByName(Queue.class, durableExclusiveQueueName); queue.setAttribute(Queue.EXCLUSIVE, queue.getExclusive(), exclusive ? ExclusivityPolicy.CONTAINER : ExclusivityPolicy.NONE); } @@ -593,7 +593,7 @@ public class VirtualHostMessageStoreTest } } - private void sendMessageOnExchange(ExchangeImpl<?> exchange, String routingKey, boolean deliveryMode) + private void sendMessageOnExchange(Exchange<?> exchange, String routingKey, boolean deliveryMode) { //Set MessagePersistence BasicContentHeaderProperties properties = new BasicContentHeaderProperties(); @@ -685,14 +685,14 @@ public class VirtualHostMessageStoreTest when(sessionModel.getAMQPConnection()).thenReturn(connectionModel); when(connectionModel.getRemoteContainerName()).thenReturn(queueOwner); SessionPrincipal principal = new SessionPrincipal(sessionModel); - AMQQueue<?> queue = Subject.doAs(new Subject(true, + Queue<?> queue = Subject.doAs(new Subject(true, Collections.singleton(principal), Collections.emptySet(), Collections.emptySet()), - new PrivilegedAction<AMQQueue<?>>() + new PrivilegedAction<Queue<?>>() { @Override - public AMQQueue<?> run() + public Queue<?> run() { return _virtualHost.createQueue(queueArguments); @@ -703,9 +703,9 @@ public class VirtualHostMessageStoreTest validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue); } - private Map<String, ExchangeImpl<?>> createExchanges() throws Exception + private Map<String, Exchange<?>> createExchanges() throws Exception { - Map<String, ExchangeImpl<?>> exchanges = new HashMap<String, ExchangeImpl<?>>(); + Map<String, Exchange<?>> exchanges = new HashMap<String, Exchange<?>>(); //Register non-durable DirectExchange exchanges.put(nonDurableExchangeName, createExchange(ExchangeDefaults.DIRECT_EXCHANGE_CLASS, nonDurableExchangeName, false)); @@ -717,9 +717,9 @@ public class VirtualHostMessageStoreTest return exchanges; } - private ExchangeImpl<?> createExchange(String type, String name, boolean durable) throws Exception + private Exchange<?> createExchange(String type, String name, boolean durable) throws Exception { - ExchangeImpl<?> exchange = null; + Exchange<?> exchange = null; Map<String,Object> attributes = new HashMap<String, Object>(); @@ -734,7 +734,7 @@ public class VirtualHostMessageStoreTest return exchange; } - private void bindAllQueuesToExchange(ExchangeImpl<?> exchange, String routingKey) + private void bindAllQueuesToExchange(Exchange<?> exchange, String routingKey) { bindQueueToExchange(exchange, routingKey, _virtualHost.getChildByName(Queue.class, durablePriorityQueueName), false); bindQueueToExchange(exchange, routingKey, _virtualHost.getChildByName(Queue.class, durableQueueName), false); @@ -743,7 +743,7 @@ public class VirtualHostMessageStoreTest bindQueueToExchange(exchange, routingKey, _virtualHost.getChildByName(Queue.class, durableExclusiveQueueName), false); } - private void bindAllTopicQueuesToExchange(ExchangeImpl<?> exchange, String routingKey) + private void bindAllTopicQueuesToExchange(Exchange<?> exchange, String routingKey) { bindQueueToExchange(exchange, routingKey, _virtualHost.getChildByName(Queue.class, @@ -754,7 +754,7 @@ public class VirtualHostMessageStoreTest } - protected void bindQueueToExchange(ExchangeImpl<?> exchange, + protected void bindQueueToExchange(Exchange<?> exchange, String routingKey, Queue queue, boolean useSelector) @@ -768,7 +768,7 @@ public class VirtualHostMessageStoreTest try { - exchange.addBinding(routingKey, (AMQQueue) queue, bindArguments); + exchange.addBinding(routingKey, queue, bindArguments); } catch (Exception e) { @@ -776,9 +776,9 @@ public class VirtualHostMessageStoreTest } } - protected void unbindQueueFromExchange(ExchangeImpl<?> exchange, + protected void unbindQueueFromExchange(Exchange<?> exchange, String routingKey, - AMQQueue<?> queue, + Queue<?> queue, boolean useSelector) { Map<String,Object> bindArguments = new HashMap<String, Object>(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
