You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/12/11 16:50:21 UTC
svn commit: r1719463 [5/6] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkel...
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostalias/VirtualHostAliasTest.java Fri Dec 11 15:50:19 2015
@@ -40,12 +40,11 @@ import org.apache.qpid.server.model.Virt
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class VirtualHostAliasTest extends QpidTestCase
{
- private final Map<String, VirtualHost<?,?,?>> _vhosts = new HashMap<>();
+ private final Map<String, VirtualHost<?>> _vhosts = new HashMap<>();
private Broker<?> _broker;
private AmqpPort _port;
@@ -63,7 +62,7 @@ public class VirtualHostAliasTest extend
for(String name : new String[] { "red", "blue", "purple", "black" })
{
boolean defaultVHN = "black".equals(name);
- VirtualHostImpl<?, ?, ?> virtualHost = BrokerTestHelper.createVirtualHost(name, _broker, defaultVHN);
+ VirtualHost<?> virtualHost = BrokerTestHelper.createVirtualHost(name, _broker, defaultVHN);
VirtualHostNode vhn = virtualHost.getParent(VirtualHostNode.class);
assertNotSame(vhn.getName(), virtualHost.getName());
_vhosts.put(name, virtualHost);
@@ -97,7 +96,7 @@ public class VirtualHostAliasTest extend
public void testDefaultAliases_VirtualHostNameAlias()
{
- VirtualHostImpl vhost = _port.getVirtualHost("red");
+ VirtualHost<?> vhost = _port.getVirtualHost("red");
assertNotNull(vhost);
assertEquals(_vhosts.get("red"), vhost);
@@ -116,7 +115,7 @@ public class VirtualHostAliasTest extend
{
// test the default vhost resolution
- VirtualHostImpl vhost = _port.getVirtualHost("");
+ VirtualHost<?> vhost = _port.getVirtualHost("");
assertNotNull(vhost);
assertEquals(_vhosts.get("black"), vhost);
@@ -125,7 +124,7 @@ public class VirtualHostAliasTest extend
public void testDefaultAliases_HostNameAlias()
{
// 127.0.0.1 should always resolve and thus return the default vhost
- VirtualHostImpl vhost = _port.getVirtualHost("127.0.0.1");
+ VirtualHost<?> vhost = _port.getVirtualHost("127.0.0.1");
assertNotNull(vhost);
assertEquals(_vhosts.get("black"), vhost);
@@ -140,7 +139,7 @@ public class VirtualHostAliasTest extend
attributes.put(PatternMatchingAlias.VIRTUAL_HOST_NODE, _vhosts.get("purple").getParent(VirtualHostNode.class));
_port.createVirtualHostAlias(attributes);
- VirtualHostImpl vhost = _port.getVirtualHost("orange");
+ VirtualHost<?> vhost = _port.getVirtualHost("orange");
assertNotNull(vhost);
assertEquals(_vhosts.get("purple"), vhost);
@@ -167,7 +166,7 @@ public class VirtualHostAliasTest extend
public void testPriority()
{
- VirtualHostImpl vhost = _port.getVirtualHost("blue");
+ VirtualHost<?> vhost = _port.getVirtualHost("blue");
assertNotNull(vhost);
assertEquals(_vhosts.get("blue"), vhost);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java Fri Dec 11 15:50:19 2015
@@ -119,7 +119,7 @@ public class AbstractStandardVirtualHost
node.open();
node.start();
- VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
+ VirtualHost<?> virtualHost = node.getVirtualHost();
assertNotNull("Virtual host was not recovered", virtualHost);
assertEquals("Unexpected virtual host name", TEST_VIRTUAL_HOST_NAME, virtualHost.getName());
assertEquals("Unexpected virtual host state", State.ACTIVE, virtualHost.getState());
@@ -143,7 +143,7 @@ public class AbstractStandardVirtualHost
node.open();
node.start();
- VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
+ VirtualHost<?> virtualHost = node.getVirtualHost();
assertNull("Virtual host should not be automatically created", virtualHost);
node.close();
}
@@ -170,7 +170,7 @@ public class AbstractStandardVirtualHost
node.open();
node.start();
- VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
+ VirtualHost<?> virtualHost = node.getVirtualHost();
assertNotNull("Virtual host should be created by blueprint", virtualHost);
assertEquals("Unexpected virtual host name", TEST_VIRTUAL_HOST_NAME, virtualHost.getName());
@@ -206,7 +206,7 @@ public class AbstractStandardVirtualHost
node.open();
node.start();
- VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
+ VirtualHost<?> virtualHost = node.getVirtualHost();
assertNull("Virtual host should not be created by blueprint", virtualHost);
node.close();
@@ -238,7 +238,7 @@ public class AbstractStandardVirtualHost
node.open();
node.start();
- VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost();
+ VirtualHost<?> virtualHost = node.getVirtualHost();
assertNotNull("Virtual host should be recovered", virtualHost);
assertEquals("Unexpected virtual host name", TEST_VIRTUAL_HOST_NAME, virtualHost.getName());
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java Fri Dec 11 15:50:19 2015
@@ -327,7 +327,7 @@ public class AMQPConnection_0_10 extends
return _connection.getRemoteContainerName();
}
- public VirtualHost<?, ?, ?> getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _connection.getVirtualHost();
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Fri Dec 11 15:50:19 2015
@@ -41,9 +41,9 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.protocol.MessageConverterRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.QueueConsumer;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.txn.AutoCommitTransaction;
@@ -463,9 +463,9 @@ public class ConsumerTarget_0_10 extends
if (requeues == 0)
{
TransactionLogResource owningResource = entry.getOwningResource();
- if(owningResource instanceof AMQQueue)
+ if(owningResource instanceof Queue)
{
- final AMQQueue queue = (AMQQueue)owningResource;
+ final Queue<?> queue = (Queue<?>)owningResource;
final Exchange alternateExchange = queue.getAlternateExchange();
if(alternateExchange != null)
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java Fri Dec 11 15:50:19 2015
@@ -26,10 +26,10 @@ import java.util.Collections;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
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;
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;
@@ -51,7 +51,7 @@ public class MessageConverter_Internal_t
}
@Override
- public MessageTransferMessage convert(InternalMessage serverMsg, VirtualHostImpl vhost)
+ public MessageTransferMessage convert(InternalMessage serverMsg, VirtualHost<?> vhost)
{
return new MessageTransferMessage(convertToStoredMessage(serverMsg), null);
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java Fri Dec 11 15:50:19 2015
@@ -31,11 +31,11 @@ import java.util.Map;
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.plugin.PluggableService;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-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;
@@ -61,7 +61,7 @@ public class MessageConverter_v0_10 impl
}
@Override
- public MessageTransferMessage convert(ServerMessage serverMsg, VirtualHostImpl vhost)
+ public MessageTransferMessage convert(ServerMessage serverMsg, VirtualHost<?> vhost)
{
return new MessageTransferMessage(convertToStoredMessage(serverMsg), null);
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java Fri Dec 11 15:50:19 2015
@@ -31,10 +31,10 @@ import java.util.Set;
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.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.MessageProperties;
import org.apache.qpid.transport.ReplyTo;
import org.apache.qpid.transport.codec.BBDecoder;
@@ -57,7 +57,7 @@ public class MessageConverter_v0_10_to_I
}
@Override
- public InternalMessage convert(MessageTransferMessage serverMessage, VirtualHostImpl vhost)
+ public InternalMessage convert(MessageTransferMessage serverMessage, VirtualHost<?> vhost)
{
final String mimeType = serverMessage.getMessageHeader().getMimeType();
byte[] data = new byte[(int) serverMessage.getSize()];
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Fri Dec 11 15:50:19 2015
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.ConnectionClosingTicker;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.ConnectionMessages;
@@ -52,7 +53,6 @@ import org.apache.qpid.server.security.A
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.Connection;
import org.apache.qpid.transport.ConnectionClose;
import org.apache.qpid.transport.ConnectionCloseCode;
@@ -73,7 +73,7 @@ public class ServerConnection extends Co
private Principal _authorizedPrincipal = null;
private final long _connectionId;
private final Object _reference = new Object();
- private VirtualHostImpl<?,?,?> _virtualHost;
+ private VirtualHost<?> _virtualHost;
private final AmqpPort<?> _port;
private final AtomicLong _lastIoTime = new AtomicLong();
private boolean _blocking;
@@ -163,12 +163,12 @@ public class ServerConnection extends Co
_amqpConnection = serverProtocolEngine;
}
- public VirtualHostImpl<?,?,?> getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
- public void setVirtualHost(VirtualHostImpl<?,?,?> virtualHost)
+ public void setVirtualHost(VirtualHost<?> virtualHost)
{
_virtualHost = virtualHost;
_messageCompressionThreshold =
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Fri Dec 11 15:50:19 2015
@@ -44,12 +44,12 @@ import org.apache.qpid.properties.Connec
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.transport.AMQPConnection;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.*;
import org.apache.qpid.transport.network.NetworkConnection;
@@ -167,7 +167,7 @@ public class ServerConnectionDelegate ex
{
final ServerConnection sconn = (ServerConnection) conn;
- VirtualHostImpl vhost;
+ VirtualHost<?> vhost;
String vhostName;
if(open.hasVirtualHost())
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Fri Dec 11 15:50:19 2015
@@ -71,10 +71,11 @@ import org.apache.qpid.server.model.Brok
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.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.CapacityChecker;
import org.apache.qpid.server.protocol.ConsumerListener;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.security.*;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreException;
@@ -97,7 +98,6 @@ import org.apache.qpid.server.txn.Unknow
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.Deletable;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.Binary;
import org.apache.qpid.transport.Connection;
import org.apache.qpid.transport.MessageCreditUnit;
@@ -776,7 +776,7 @@ public class ServerSession extends Sessi
return getVirtualHost().getMessageStore();
}
- public VirtualHostImpl<?,?,?> getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return getConnection().getVirtualHost();
}
@@ -826,7 +826,7 @@ public class ServerSession extends Sessi
_transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, openWarn, openClose, idleWarn, idleClose);
}
- public void block(AMQQueue queue)
+ public void block(Queue<?> queue)
{
block(queue, queue.getName());
}
@@ -858,7 +858,7 @@ public class ServerSession extends Sessi
}
}
- public void unblock(AMQQueue queue)
+ public void unblock(Queue<?> queue)
{
unblock((Object)queue);
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Fri Dec 11 15:50:19 2015
@@ -38,9 +38,10 @@ import org.apache.qpid.bytebuffer.QpidBy
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.transport.ProtocolEngine;
import org.apache.qpid.server.consumer.ConsumerImpl;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.store.MessageHandle;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
@@ -60,7 +61,6 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.NoFactoryForTypeException;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UnknownConfiguredObjectException;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreException;
@@ -81,7 +81,6 @@ import org.apache.qpid.server.virtualhos
import org.apache.qpid.server.virtualhost.QueueExistsException;
import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.*;
public class ServerSessionDelegate extends SessionDelegate
@@ -212,7 +211,7 @@ public class ServerSessionDelegate exten
else
{
String queueName = method.getQueue();
- VirtualHostImpl<?,?,?> vhost = getVirtualHost(session);
+ VirtualHost<?> vhost = getVirtualHost(session);
final Collection<MessageSource> sources = new HashSet<>();
final MessageSource queue = vhost.getAttainedMessageSource(queueName);
@@ -340,11 +339,11 @@ public class ServerSessionDelegate exten
options));
}
}
- catch (AMQQueue.ExistingExclusiveConsumer existing)
+ catch (Queue.ExistingExclusiveConsumer existing)
{
exception(session, method, ExecutionErrorCode.RESOURCE_LOCKED, "Queue has an exclusive consumer");
}
- catch (AMQQueue.ExistingConsumerPreventsExclusive exclusive)
+ catch (Queue.ExistingConsumerPreventsExclusive exclusive)
{
exception(session, method, ExecutionErrorCode.RESOURCE_LOCKED, "Queue has an existing consumer - can't subscribe exclusively");
}
@@ -409,7 +408,7 @@ public class ServerSessionDelegate exten
final MessageMetaData_0_10 messageMetaData = new MessageMetaData_0_10(xfr);
- final VirtualHostImpl virtualHost = getVirtualHost(ssn);
+ final VirtualHost<?> virtualHost = getVirtualHost(ssn);
try
{
virtualHost.getSecurityManager()
@@ -818,7 +817,7 @@ public class ServerSessionDelegate exten
public void exchangeDeclare(Session session, ExchangeDeclare method)
{
String exchangeName = method.getExchange();
- VirtualHostImpl virtualHost = getVirtualHost(session);
+ VirtualHost<?> virtualHost = getVirtualHost(session);
//we must check for any unsupported arguments present and throw not-implemented
if(method.hasArguments())
@@ -853,7 +852,7 @@ public class ServerSessionDelegate exten
if(method.getPassive())
{
- ExchangeImpl exchange = getExchange(session, exchangeName);
+ Exchange<?> exchange = getExchange(session, exchangeName);
if(exchange == null)
{
@@ -886,7 +885,7 @@ public class ServerSessionDelegate exten
}
catch(ReservedExchangeNameException e)
{
- ExchangeImpl existingExchange = getExchange(session, exchangeName);
+ Exchange<?> existingExchange = getExchange(session, exchangeName);
if(existingExchange == null
|| !existingExchange.getType().equals(method.getType())
|| (method.hasAlternateExchange() && (existingExchange.getAlternateExchange() == null ||
@@ -908,7 +907,7 @@ public class ServerSessionDelegate exten
}
catch(ExchangeExistsException e)
{
- ExchangeImpl exchange = e.getExistingExchange();
+ Exchange<?> exchange = e.getExistingExchange();
if(!exchange.getType().equals(method.getType()))
{
exception(session, method, ExecutionErrorCode.NOT_ALLOWED,
@@ -948,14 +947,14 @@ public class ServerSessionDelegate exten
((ServerSession)session).close(errorCode.getValue(), description);
}
- private ExchangeImpl getExchange(Session session, String exchangeName)
+ private Exchange<?> getExchange(Session session, String exchangeName)
{
return getVirtualHost(session).getAttainedExchange(exchangeName);
}
private MessageDestination getDestinationForMessage(Session ssn, MessageTransfer xfr)
{
- VirtualHostImpl virtualHost = getVirtualHost(ssn);
+ VirtualHost<?> virtualHost = getVirtualHost(ssn);
MessageDestination destination;
if(xfr.hasDestination())
@@ -973,7 +972,7 @@ public class ServerSessionDelegate exten
return destination;
}
- private VirtualHostImpl<?,?,?> getVirtualHost(Session session)
+ private VirtualHost<?> getVirtualHost(Session session)
{
ServerConnection conn = getServerConnection(session);
return conn.getVirtualHost();
@@ -993,7 +992,7 @@ public class ServerSessionDelegate exten
return;
}
- ExchangeImpl exchange = getExchange(session, method.getExchange());
+ Exchange<?> exchange = getExchange(session, method.getExchange());
if(exchange == null)
{
@@ -1055,7 +1054,7 @@ public class ServerSessionDelegate exten
}
else
{
- ExchangeImpl exchange = getExchange(session, exchangeName);
+ Exchange<?> exchange = getExchange(session, exchangeName);
if(exchange != null)
{
@@ -1075,7 +1074,7 @@ public class ServerSessionDelegate exten
public void exchangeBind(Session session, ExchangeBind method)
{
- VirtualHostImpl virtualHost = getVirtualHost(session);
+ VirtualHost<?> virtualHost = getVirtualHost(session);
if (!method.hasQueue())
{
@@ -1096,8 +1095,8 @@ public class ServerSessionDelegate exten
{
method.setBindingKey(method.getQueue());
}
- AMQQueue queue = virtualHost.getAttainedQueue(method.getQueue());
- ExchangeImpl exchange = virtualHost.getAttainedExchange(exchangeName);
+ Queue<?> queue = virtualHost.getAttainedQueue(method.getQueue());
+ Exchange<?> exchange = virtualHost.getAttainedExchange(exchangeName);
if(queue == null)
{
exception(session, method, ExecutionErrorCode.NOT_FOUND, "Queue: '" + method.getQueue() + "' not found");
@@ -1140,7 +1139,7 @@ public class ServerSessionDelegate exten
@Override
public void exchangeUnbind(Session session, ExchangeUnbind method)
{
- VirtualHostImpl virtualHost = getVirtualHost(session);
+ VirtualHost<?> virtualHost = getVirtualHost(session);
if (!method.hasQueue())
{
@@ -1156,8 +1155,8 @@ public class ServerSessionDelegate exten
}
else
{
- AMQQueue queue = virtualHost.getAttainedQueue(method.getQueue());
- ExchangeImpl exchange = virtualHost.getAttainedExchange(method.getExchange());
+ Queue<?> queue = virtualHost.getAttainedQueue(method.getQueue());
+ Exchange<?> exchange = virtualHost.getAttainedExchange(method.getExchange());
if(queue == null)
{
exception(session, method, ExecutionErrorCode.NOT_FOUND, "Queue: '" + method.getQueue() + "' not found");
@@ -1188,10 +1187,10 @@ public class ServerSessionDelegate exten
{
ExchangeBoundResult result = new ExchangeBoundResult();
- VirtualHostImpl virtualHost = getVirtualHost(session);
- ExchangeImpl exchange;
+ VirtualHost<?> virtualHost = getVirtualHost(session);
+ Exchange<?> exchange;
MessageSource source;
- AMQQueue<?> queue;
+ Queue<?> queue;
boolean isDefaultExchange;
if(!nameNullOrEmpty(method.getExchange()))
{
@@ -1254,9 +1253,9 @@ public class ServerSessionDelegate exten
{
result.setQueueNotFound(true);
}
- if(source == null || source instanceof AMQQueue)
+ if(source == null || source instanceof Queue)
{
- queue = (AMQQueue<?>) source;
+ queue = (Queue<?>) source;
if (exchange != null && queue != null)
{
@@ -1375,7 +1374,7 @@ public class ServerSessionDelegate exten
return getVirtualHost(session).getAttainedMessageSource(queue);
}
- private AMQQueue getQueue(Session session, String queue)
+ private Queue<?> getQueue(Session session, String queue)
{
return getVirtualHost(session).getAttainedQueue(queue);
}
@@ -1384,10 +1383,10 @@ public class ServerSessionDelegate exten
public void queueDeclare(Session session, final QueueDeclare method)
{
- final VirtualHostImpl virtualHost = getVirtualHost(session);
+ final VirtualHost<?> virtualHost = getVirtualHost(session);
String queueName = method.getQueue();
- AMQQueue queue;
+ Queue<?> queue;
//TODO: do we need to check that the queue already exists with exactly the same "configuration"?
final boolean exclusive = method.getExclusive();
@@ -1501,7 +1500,7 @@ public class ServerSessionDelegate exten
}
else
{
- AMQQueue queue = getQueue(session, queueName);
+ Queue<?> queue = getQueue(session, queueName);
if (queue == null)
@@ -1526,7 +1525,7 @@ public class ServerSessionDelegate exten
}
else
{
- VirtualHostImpl virtualHost = getVirtualHost(session);
+ VirtualHost<?> virtualHost = getVirtualHost(session);
try
{
@@ -1551,7 +1550,7 @@ public class ServerSessionDelegate exten
}
else
{
- AMQQueue queue = getQueue(session, queueName);
+ Queue<?> queue = getQueue(session, queueName);
if (queue == null)
{
@@ -1582,9 +1581,9 @@ public class ServerSessionDelegate exten
{
result.setQueue(source.getName());
- if (source instanceof AMQQueue)
+ if (source instanceof Queue)
{
- final AMQQueue queue = (AMQQueue) source;
+ final Queue<?> queue = (Queue<?>) source;
result.setDurable(queue.isDurable());
result.setExclusive(queue.isExclusive());
result.setAutoDelete(queue.getLifetimePolicy() != LifetimePolicy.PERMANENT);
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java Fri Dec 11 15:50:19 2015
@@ -26,9 +26,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.qpid.server.exchange.ExchangeImpl;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.ExchangeDelete;
import org.apache.qpid.transport.ExecutionErrorCode;
@@ -38,7 +37,7 @@ import org.mockito.ArgumentMatcher;
public class ServerSessionDelegateTest extends QpidTestCase
{
- private VirtualHostImpl<?, AMQQueue<?>, ExchangeImpl<?>> _host;
+ private VirtualHost<?> _host;
private ServerSession _session;
private ServerSessionDelegate _delegate;
@@ -46,7 +45,7 @@ public class ServerSessionDelegateTest e
public void setUp() throws Exception
{
super.setUp();
- _host = mock(VirtualHostImpl.class);
+ _host = mock(VirtualHost.class);
ServerConnection serverConnection = mock(ServerConnection.class);
doReturn(_host).when(serverConnection).getVirtualHost();
@@ -59,7 +58,7 @@ public class ServerSessionDelegateTest e
public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
{
- ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(true);
doReturn(exchange).when(_host).getAttainedExchange(getTestName());
@@ -80,7 +79,7 @@ public class ServerSessionDelegateTest e
public void testExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
{
- ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(false);
doReturn(exchange).when(_host).getAttainedExchange(getTestName());
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java Fri Dec 11 15:50:19 2015
@@ -33,9 +33,9 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.Binary;
import org.apache.qpid.transport.ExecutionErrorCode;
@@ -46,7 +46,7 @@ import org.apache.qpid.transport.Method;
public class ServerSessionTest extends QpidTestCase
{
- private VirtualHostImpl _virtualHost;
+ private VirtualHost<?> _virtualHost;
@Override
public void setUp() throws Exception
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.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/AMQChannel.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Fri Dec 11 15:50:19 2015
@@ -62,7 +62,6 @@ import org.apache.qpid.server.Transactio
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.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.ArrivalTimeFilter;
import org.apache.qpid.server.filter.FilterManager;
@@ -94,10 +93,10 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.model.Session;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.UnknownConfiguredObjectException;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.CapacityChecker;
import org.apache.qpid.server.protocol.ConsumerListener;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.MessageHandle;
@@ -110,14 +109,12 @@ import org.apache.qpid.server.txn.LocalT
import org.apache.qpid.server.txn.LocalTransaction.ActivityTimeAccessor;
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.util.ServerScopedRuntimeException;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
import org.apache.qpid.server.virtualhost.QueueExistsException;
import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.network.Ticker;
public class AMQChannel
@@ -147,7 +144,7 @@ public class AMQChannel
private long _deliveryTag = 0;
/** A channel has a default queue (the last declared) that is used when no queue name is explicitly set */
- private volatile AMQQueue<?> _defaultQueue;
+ private volatile Queue<?> _defaultQueue;
/** This tag is unique per subscription to a queue. The server returns this in response to a basic.consume request. */
private int _consumerTag;
@@ -401,7 +398,7 @@ public class AMQChannel
public void setPublishFrame(MessagePublishInfo info, final MessageDestination e)
{
String routingKey = AMQShortString.toString(info.getRoutingKey());
- VirtualHostImpl virtualHost = getVirtualHost();
+ VirtualHost<?> virtualHost = getVirtualHost();
SecurityManager securityManager = virtualHost.getSecurityManager();
securityManager.authorisePublish(info.isImmediate(), routingKey, e.getName(), virtualHost.getName(), _subject);
@@ -1489,7 +1486,7 @@ public class AMQChannel
final InstanceProperties props, final long deliveryTag)
{
_singleMessageCredit.useCreditForMessage(message.getSize());
- int queueSize = _queue instanceof AMQQueue ? ((AMQQueue)_queue).getQueueDepthMessages() : 0;
+ int queueSize = _queue instanceof Queue ? ((Queue<?>)_queue).getQueueDepthMessages() : 0;
long size = _connection.getProtocolOutputConverter().writeGetOk(message,
props,
AMQChannel.this.getChannelId(),
@@ -1701,7 +1698,7 @@ public class AMQChannel
}
- public synchronized void block(AMQQueue queue)
+ public synchronized void block(Queue<?> queue)
{
if(_blockingEntities.add(queue))
{
@@ -1715,7 +1712,7 @@ public class AMQChannel
}
}
- public synchronized void unblock(AMQQueue queue)
+ public synchronized void unblock(Queue<?> queue)
{
if(_blockingEntities.remove(queue))
{
@@ -1758,7 +1755,7 @@ public class AMQChannel
return _blocking.get();
}
- public VirtualHostImpl getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return getConnection().getVirtualHost();
}
@@ -1798,9 +1795,9 @@ public class AMQChannel
{
final TransactionLogResource owningResource = rejectedQueueEntry.getOwningResource();
- if(owningResource instanceof AMQQueue)
+ if(owningResource instanceof Queue)
{
- final AMQQueue queue = (AMQQueue) owningResource;
+ final Queue<?> queue = (Queue<?>) owningResource;
final Exchange altExchange = queue.getAlternateExchange();
@@ -2119,7 +2116,7 @@ public class AMQChannel
}
AMQShortString consumerTag1 = consumerTag;
- VirtualHostImpl<?, ?, ?> vHost = _connection.getVirtualHost();
+ VirtualHost<?> vHost = _connection.getVirtualHost();
sync();
String queueName = AMQShortString.toString(queue);
@@ -2201,7 +2198,7 @@ public class AMQChannel
}
- catch (AMQQueue.ExistingExclusiveConsumer e)
+ catch (Queue.ExistingExclusiveConsumer e)
{
_connection.sendConnectionClose(AMQConstant.ACCESS_REFUSED,
"Cannot subscribe to queue '"
@@ -2209,7 +2206,7 @@ public class AMQChannel
+ "' as it already has an existing exclusive consumer", _channelId);
}
- catch (AMQQueue.ExistingConsumerPreventsExclusive e)
+ catch (Queue.ExistingConsumerPreventsExclusive e)
{
_connection.sendConnectionClose(AMQConstant.ACCESS_REFUSED,
"Cannot subscribe to queue '"
@@ -2244,7 +2241,7 @@ public class AMQChannel
_logger.debug("RECV[" + _channelId + "] BasicGet[" +" queue: " + queueName + " noAck: " + noAck + " ]");
}
- VirtualHostImpl vHost = _connection.getVirtualHost();
+ VirtualHost<?> vHost = _connection.getVirtualHost();
sync();
MessageSource queue = queueName == null ? getDefaultQueue() : vHost.getAttainedMessageSource(queueName.toString());
if (queue == null)
@@ -2317,7 +2314,7 @@ public class AMQChannel
- VirtualHostImpl vHost = _connection.getVirtualHost();
+ VirtualHost<?> vHost = _connection.getVirtualHost();
if(blockingTimeoutExceeded())
{
@@ -2699,7 +2696,7 @@ public class AMQChannel
routingKey + " queue: " + queueName + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
MethodRegistry methodRegistry = _connection.getMethodRegistry();
sync();
@@ -2745,7 +2742,7 @@ public class AMQChannel
}
else
{
- AMQQueue queue = virtualHost.getAttainedQueue(queueName.toString());
+ Queue<?> queue = virtualHost.getAttainedQueue(queueName.toString());
if (queue == null)
{
@@ -2764,7 +2761,7 @@ public class AMQChannel
}
else
{
- ExchangeImpl exchange = virtualHost.getAttainedExchange(exchangeName.toString());
+ Exchange<?> exchange = virtualHost.getAttainedExchange(exchangeName.toString());
if (exchange == null)
{
@@ -2789,7 +2786,7 @@ public class AMQChannel
else
{
- AMQQueue queue = virtualHost.getAttainedQueue(queueName.toString());
+ Queue<?> queue = virtualHost.getAttainedQueue(queueName.toString());
if (queue == null)
{
replyCode = ExchangeBoundOkBody.QUEUE_NOT_FOUND;
@@ -2816,7 +2813,7 @@ public class AMQChannel
}
else if (queueName != null)
{
- AMQQueue queue = virtualHost.getAttainedQueue(queueName.toString());
+ Queue<?> queue = virtualHost.getAttainedQueue(queueName.toString());
if (queue == null)
{
replyCode = ExchangeBoundOkBody.QUEUE_NOT_FOUND;
@@ -2887,8 +2884,8 @@ public class AMQChannel
final MethodRegistry methodRegistry = _connection.getMethodRegistry();
final AMQMethodBody declareOkBody = methodRegistry.createExchangeDeclareOkBody();
- ExchangeImpl exchange;
- VirtualHostImpl<?, ?, ?> virtualHost = _connection.getVirtualHost();
+ Exchange<?> exchange;
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
if (isDefaultExchange(exchangeName))
{
@@ -3043,7 +3040,7 @@ public class AMQChannel
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
sync();
if (isDefaultExchange(exchangeStr))
@@ -3057,7 +3054,7 @@ public class AMQChannel
{
final String exchangeName = exchangeStr.toString();
- final ExchangeImpl exchange = virtualHost.getAttainedExchange(exchangeName);
+ final Exchange<?> exchange = virtualHost.getAttainedExchange(exchangeName);
if (exchange == null)
{
closeChannel(AMQConstant.NOT_FOUND, "No such exchange: '" + exchangeStr + "'");
@@ -3113,8 +3110,8 @@ public class AMQChannel
" nowait: " + nowait + " arguments: " + argumentsTable + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
- AMQQueue<?> queue;
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
+ Queue<?> queue;
if (queueName == null)
{
@@ -3152,7 +3149,7 @@ public class AMQChannel
final String exchangeName = exchange.toString();
- final ExchangeImpl exch = virtualHost.getAttainedExchange(exchangeName);
+ final Exchange<?> exch = virtualHost.getAttainedExchange(exchangeName);
if (exch == null)
{
closeChannel(AMQConstant.NOT_FOUND,
@@ -3222,7 +3219,7 @@ public class AMQChannel
" autoDelete: " + autoDelete + " nowait: " + nowait + " arguments: " + arguments + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
final AMQShortString queueName;
@@ -3236,7 +3233,7 @@ public class AMQChannel
queueName = queueStr;
}
- AMQQueue<?> queue;
+ Queue<?> queue;
//TODO: do we need to check that the queue already exists with exactly the same "configuration"?
@@ -3413,9 +3410,9 @@ public class AMQChannel
_logger.debug("RECV[" + _channelId + "] QueueDelete[" +" queue: " + queueName + " ifUnused: " + ifUnused + " ifEmpty: " + ifEmpty + " nowait: " + nowait + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
sync();
- AMQQueue queue;
+ Queue<?> queue;
if (queueName == null)
{
@@ -3483,8 +3480,8 @@ public class AMQChannel
_logger.debug("RECV[" + _channelId + "] QueuePurge[" +" queue: " + queueName + " nowait: " + nowait + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
- AMQQueue queue = null;
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
+ Queue<?> queue = null;
if (queueName == null && (queue = getDefaultQueue()) == null)
{
@@ -3536,11 +3533,11 @@ public class AMQChannel
" arguments: " + arguments + " ]");
}
- VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ VirtualHost<?> virtualHost = _connection.getVirtualHost();
final boolean useDefaultQueue = queueName == null;
- final AMQQueue queue = useDefaultQueue
+ final Queue<?> queue = useDefaultQueue
? getDefaultQueue()
: virtualHost.getAttainedQueue(queueName.toString());
@@ -3562,7 +3559,7 @@ public class AMQChannel
else
{
- final ExchangeImpl exch = virtualHost.getAttainedExchange(exchange.toString());
+ final Exchange<?> exch = virtualHost.getAttainedExchange(exchange.toString());
if (exch == null)
{
@@ -3697,9 +3694,9 @@ public class AMQChannel
return exchangeName == null || AMQShortString.EMPTY_STRING.equals(exchangeName);
}
- private void setDefaultQueue(AMQQueue<?> queue)
+ private void setDefaultQueue(Queue<?> queue)
{
- AMQQueue<?> currentDefaultQueue = _defaultQueue;
+ Queue<?> currentDefaultQueue = _defaultQueue;
if (queue != currentDefaultQueue)
{
if (currentDefaultQueue != null)
@@ -3714,15 +3711,15 @@ public class AMQChannel
_defaultQueue = queue;
}
- private AMQQueue getDefaultQueue()
+ private Queue<?> getDefaultQueue()
{
return _defaultQueue;
}
- private class DefaultQueueAssociationClearingTask implements Action<AMQQueue>
+ private class DefaultQueueAssociationClearingTask implements Action<Queue<?>>
{
@Override
- public void performAction(final AMQQueue queue)
+ public void performAction(final Queue<?> queue)
{
if ( queue == _defaultQueue)
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_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/AMQPConnection_0_8.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Fri Dec 11 15:50:19 2015
@@ -32,7 +32,6 @@ import java.security.Principal;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -63,10 +62,10 @@ import org.apache.qpid.framing.*;
import org.apache.qpid.properties.ConnectionStartProperties;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.ConnectionClosingTicker;
import org.apache.qpid.server.security.*;
import org.apache.qpid.server.transport.AbstractAMQPConnection;
-import org.apache.qpid.server.transport.MultiVersionProtocolEngine;
import org.apache.qpid.server.transport.ProtocolEngine;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.consumer.ConsumerImpl;
@@ -86,7 +85,6 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.TransportException;
import org.apache.qpid.transport.network.AggregateTicker;
@@ -116,7 +114,7 @@ public class AMQPConnection_0_8
private final AtomicBoolean _stateChanged = new AtomicBoolean();
private final AtomicReference<Action<ProtocolEngine>> _workListener = new AtomicReference<>();
- private volatile VirtualHostImpl<?,?,?> _virtualHost;
+ private volatile VirtualHost<?> _virtualHost;
private final Object _channelAddRemoveLock = new Object();
private final Map<Integer, AMQChannel> _channelMap = new ConcurrentHashMap<>();
@@ -722,12 +720,12 @@ public class AMQPConnection_0_8
return getMethodRegistry();
}
- public VirtualHostImpl<?,?,?> getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
- public void setVirtualHost(VirtualHostImpl<?,?,?> virtualHost)
+ public void setVirtualHost(VirtualHost<?> virtualHost)
{
_virtualHost = virtualHost;
virtualHostAssociated();
@@ -1033,7 +1031,7 @@ public class AMQPConnection_0_8
virtualHostStr = virtualHostStr.substring(1);
}
- VirtualHostImpl<?,?,?> virtualHost = ((AmqpPort)getPort()).getVirtualHost(virtualHostStr);
+ VirtualHost<?> virtualHost = ((AmqpPort)getPort()).getVirtualHost(virtualHostStr);
if (virtualHost == null)
{
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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015
@@ -38,11 +38,11 @@ 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.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.codec.BBEncoder;
@PluggableService
@@ -64,7 +64,7 @@ public class MessageConverter_Internal_t
}
@Override
- public AMQMessage convert(InternalMessage serverMsg, VirtualHostImpl vhost)
+ public AMQMessage convert(InternalMessage serverMsg, VirtualHost<?> vhost)
{
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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015
@@ -32,10 +32,10 @@ import java.util.Set;
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.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.codec.BBDecoder;
import org.apache.qpid.typedmessage.TypedBytesContentReader;
import org.apache.qpid.typedmessage.TypedBytesFormatException;
@@ -57,7 +57,7 @@ public class MessageConverter_v0_8_to_In
}
@Override
- public InternalMessage convert(AMQMessage serverMessage, VirtualHostImpl vhost)
+ public InternalMessage convert(AMQMessage serverMessage, VirtualHost<?> vhost)
{
final String mimeType = serverMessage.getMessageHeader().getMimeType();
byte[] data = new byte[(int) serverMessage.getSize()];
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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.when;
import java.security.Principal;
import java.util.Collections;
import java.util.Set;
-import java.util.concurrent.Executor;
import javax.security.auth.Subject;
@@ -43,7 +42,6 @@ import org.apache.qpid.framing.MethodReg
import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageContentSource;
@@ -52,8 +50,9 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Connection;
+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.queue.AMQQueue;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.store.MessageHandle;
import org.apache.qpid.server.store.MessageStore;
@@ -62,14 +61,13 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.store.StoredMemoryMessage;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class AMQChannelTest extends QpidTestCase
{
public static final AMQShortString ROUTING_KEY = AMQShortString.valueOf("routingKey");
- private VirtualHostImpl<?, AMQQueue<?>, ExchangeImpl<?>> _virtualHost;
+ private VirtualHost<?> _virtualHost;
private AMQPConnection_0_8 _amqConnection;
private MessageStore _messageStore;
private AmqpPort<?> _port;
@@ -90,7 +88,7 @@ public class AMQChannelTest extends Qpid
_messageStore = mock(MessageStore.class);
- _virtualHost = mock(VirtualHostImpl.class);
+ _virtualHost = mock(VirtualHost.class);
when(_virtualHost.getContextValue(Integer.class, Broker.MESSAGE_COMPRESSION_THRESHOLD_SIZE)).thenReturn(1);
when(_virtualHost.getContextValue(Long.class, Connection.MAX_UNCOMMITTED_IN_MEMORY_SIZE)).thenReturn(1l);
when(_virtualHost.getContextValue(Boolean.class, Broker.BROKER_MSG_AUTH)).thenReturn(false);
@@ -112,7 +110,7 @@ public class AMQChannelTest extends Qpid
_amqConnection = mock(AMQPConnection_0_8.class);
when(_amqConnection.getAuthorizedSubject()).thenReturn(authenticatedSubject);
when(_amqConnection.getAuthorizedPrincipal()).thenReturn(authenticatedPrincipal);
- when(_amqConnection.getVirtualHost()).thenReturn((VirtualHostImpl)_virtualHost);
+ when(_amqConnection.getVirtualHost()).thenReturn((VirtualHost)_virtualHost);
when(_amqConnection.getProtocolOutputConverter()).thenReturn(_protocolOutputConverter);
when(_amqConnection.getBroker()).thenReturn((Broker) _broker);
when(_amqConnection.getMethodRegistry()).thenReturn(new MethodRegistry(ProtocolVersion.v0_9));
@@ -123,7 +121,7 @@ public class AMQChannelTest extends Qpid
public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasBindings() throws Exception
{
String testExchangeName = getTestName();
- ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(true);
doReturn(exchange).when(_virtualHost).getAttainedExchange(testExchangeName);
@@ -138,7 +136,7 @@ public class AMQChannelTest extends Qpid
public void testReceiveExchangeDeleteWhenIfUsedIsSetAndExchangeHasNoBinding() throws Exception
{
- ExchangeImpl<?> exchange = mock(ExchangeImpl.class);
+ Exchange<?> exchange = mock(Exchange.class);
when(exchange.hasBindings()).thenReturn(false);
doReturn(exchange).when(_virtualHost).getAttainedExchange(getTestName());
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=1719463&r1=1719462&r2=1719463&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 Fri Dec 11 15:50:19 2015
@@ -57,7 +57,6 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.transport.ServerNetworkConnection;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.transport.ByteBufferSender;
@@ -73,7 +72,7 @@ public class AMQPConnection_0_8Test exte
private TaskExecutorImpl _taskExecutor;
private Broker _broker;
private VirtualHostNode _virtualHostNode;
- private VirtualHostImpl _virtualHost;
+ private VirtualHost _virtualHost;
private AmqpPort _port;
private ServerNetworkConnection _network;
private Transport _transport;
@@ -112,7 +111,7 @@ public class AMQPConnection_0_8Test exte
when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
when(_virtualHostNode.getChildExecutor()).thenReturn(_taskExecutor);
- _virtualHost = mock(VirtualHostImpl.class);
+ _virtualHost = mock(VirtualHost.class);
VirtualHostPrincipal virtualHostPrincipal = new VirtualHostPrincipal(_virtualHost);
when(_virtualHost.getParent(VirtualHostNode.class)).thenReturn(_virtualHostNode);
when(_virtualHost.getModel()).thenReturn(model);
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.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/ExtractResendAndRequeueTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java Fri Dec 11 15:50:19 2015
@@ -24,7 +24,7 @@ import org.apache.qpid.QpidException;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.invocation.InvocationOnMock;
@@ -60,7 +60,7 @@ public class ExtractResendAndRequeueTest
private UnacknowledgedMessageMapImpl _unacknowledgedMessageMap;
private static final int INITIAL_MSG_COUNT = 10;
- private AMQQueue _queue;
+ private Queue _queue;
private LinkedList<MessageInstance> _referenceList = new LinkedList<MessageInstance>();
private ConsumerImpl _consumer;
private boolean _queueDeleted;
@@ -70,7 +70,7 @@ public class ExtractResendAndRequeueTest
{
_queueDeleted = false;
_unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(100);
- _queue = mock(AMQQueue.class);
+ _queue = mock(Queue.class);
when(_queue.getName()).thenReturn(getName());
when(_queue.isDeleted()).thenReturn(_queueDeleted);
_consumer = mock(ConsumerImpl.class);
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=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/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 Fri Dec 11 15:50:19 2015
@@ -53,8 +53,6 @@ import org.apache.qpid.amqp_1_0.transpor
import org.apache.qpid.amqp_1_0.type.Binary;
import org.apache.qpid.amqp_1_0.type.FrameBody;
import org.apache.qpid.amqp_1_0.type.Symbol;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.common.ServerPropertyNames;
import org.apache.qpid.configuration.CommonProperties;
@@ -80,7 +78,6 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.network.AggregateTicker;
@@ -665,7 +662,7 @@ public class AMQPConnection_1_0 extends
return _connection.getRemoteContainerName();
}
- public VirtualHost<?, ?, ?> getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _connection.getVirtualHost();
}
@@ -688,7 +685,7 @@ public class AMQPConnection_1_0 extends
@Override
protected EventLogger getEventLogger()
{
- final VirtualHostImpl virtualHost = _connection.getVirtualHost();
+ final VirtualHost<?> virtualHost = _connection.getVirtualHost();
if (virtualHost != null)
{
return virtualHost.getEventLogger();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_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/Connection_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/Connection_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java Fri Dec 11 15:50:19 2015
@@ -52,12 +52,12 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class Connection_1_0 implements ConnectionEventListener
{
@@ -66,7 +66,7 @@ public class Connection_1_0 implements C
private final AmqpPort<?> _port;
private final SubjectCreator _subjectCreator;
private AMQPConnection_1_0 _amqpConnection;
- private VirtualHostImpl<?,?,?> _vhost;
+ private VirtualHost<?> _vhost;
private final Transport _transport;
private final ConnectionEndpoint _connectionEndpoint;
private final long _connectionId;
@@ -383,7 +383,7 @@ public class Connection_1_0 implements C
return _amqpConnection.getSubject();
}
- public VirtualHostImpl getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _vhost;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.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/ExchangeDestination.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/ExchangeDestination.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java Fri Dec 11 15:50:19 2015
@@ -25,8 +25,8 @@ import org.apache.qpid.amqp_1_0.type.mes
import org.apache.qpid.amqp_1_0.type.messaging.Rejected;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusExpiryPolicy;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.message.InstanceProperties;
+import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.txn.ServerTransaction;
public class ExchangeDestination implements ReceivingDestination, SendingDestination
@@ -35,12 +35,12 @@ public class ExchangeDestination impleme
public static final Rejected REJECTED = new Rejected();
private static final Outcome[] OUTCOMES = { ACCEPTED, REJECTED};
- private ExchangeImpl _exchange;
+ private Exchange<?> _exchange;
private TerminusDurability _durability;
private TerminusExpiryPolicy _expiryPolicy;
private String _initialRoutingAddress;
- public ExchangeDestination(ExchangeImpl exchange, TerminusDurability durable, TerminusExpiryPolicy expiryPolicy)
+ public ExchangeDestination(Exchange<?> exchange, TerminusDurability durable, TerminusExpiryPolicy expiryPolicy)
{
_exchange = exchange;
_durability = durable;
@@ -141,7 +141,7 @@ public class ExchangeDestination impleme
return 20000;
}
- public ExchangeImpl getExchange()
+ public Exchange<?> getExchange()
{
return _exchange;
}
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=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/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 Fri Dec 11 15:50:19 2015
@@ -40,10 +40,10 @@ import org.apache.qpid.amqp_1_0.type.mes
import org.apache.qpid.amqp_1_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;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.codec.BBDecoder;
import org.apache.qpid.typedmessage.TypedBytesContentReader;
import org.apache.qpid.typedmessage.TypedBytesFormatException;
@@ -64,7 +64,7 @@ public abstract class MessageConverter_t
}
@Override
- public final Message_1_0 convert(M message, VirtualHostImpl vhost)
+ public final Message_1_0 convert(M message, VirtualHost<?> vhost)
{
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=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/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 Fri Dec 11 15:50:19 2015
@@ -22,9 +22,9 @@ package org.apache.qpid.server.protocol.
import org.apache.qpid.amqp_1_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;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
@PluggableService
public class MessageConverter_v1_0_to_Internal implements MessageConverter<Message_1_0, InternalMessage>
@@ -52,7 +52,7 @@ public class MessageConverter_v1_0_to_In
}
@Override
- public InternalMessage convert(Message_1_0 serverMessage, VirtualHostImpl vhost)
+ public InternalMessage convert(Message_1_0 serverMessage, VirtualHost<?> vhost)
{
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/QueueDestination.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/QueueDestination.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/QueueDestination.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java Fri Dec 11 15:50:19 2015
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.
import org.apache.qpid.amqp_1_0.type.Outcome;
import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
import org.apache.qpid.server.message.MessageReference;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -33,7 +33,7 @@ public class QueueDestination extends Me
private static final Outcome[] OUTCOMES = new Outcome[] { ACCEPTED };
- public QueueDestination(AMQQueue queue)
+ public QueueDestination(Queue<?> queue)
{
super(queue);
}
@@ -79,9 +79,9 @@ public class QueueDestination extends Me
return 100;
}
- public AMQQueue getQueue()
+ public Queue<?> getQueue()
{
- return (AMQQueue) super.getQueue();
+ return (Queue<?>) super.getQueue();
}
}
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=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/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 Fri Dec 11 15:50:19 2015
@@ -42,15 +42,15 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.amqp_1_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.store.MessageHandle;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class ReceivingLink_1_0 implements ReceivingLinkListener, Link_1_0, DeliveryStateHandler
{
- private VirtualHostImpl _vhost;
+ private VirtualHost<?> _vhost;
private ReceivingDestination _destination;
private SectionDecoderImpl _sectionDecoder;
@@ -66,7 +66,7 @@ public class ReceivingLink_1_0 implement
private ReceiverSettleMode _receivingSettlementMode;
- public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, VirtualHostImpl vhost,
+ public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, VirtualHost<?> vhost,
ReceivingDestination destination)
{
_vhost = vhost;
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=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/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 Fri Dec 11 15:50:19 2015
@@ -63,28 +63,27 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.filter.SelectorParsingException;
import org.apache.qpid.filter.selector.ParseException;
-import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.consumer.ConsumerImpl;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.Binding;
+import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.QueueExistsException;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryStateHandler
{
private static final Logger _logger = LoggerFactory.getLogger(SendingLink_1_0.class);
- private VirtualHostImpl _vhost;
+ private VirtualHost<?> _vhost;
private SendingDestination _destination;
private ConsumerImpl _consumer;
@@ -105,7 +104,7 @@ public class SendingLink_1_0 implements
public SendingLink_1_0(final SendingLinkAttachment linkAttachment,
- final VirtualHostImpl vhost,
+ final VirtualHost<?> vhost,
final SendingDestination destination)
throws AmqpErrorException
{
@@ -127,7 +126,7 @@ public class SendingLink_1_0 implements
{
_queue = ((MessageSourceDestination) _destination).getQueue();
- if(_queue instanceof AMQQueue && ((AMQQueue)_queue).getAvailableAttributes().contains("topic"))
+ if(_queue instanceof Queue && ((Queue<?>)_queue).getAvailableAttributes().contains("topic"))
{
source.setDistributionMode(StdDistMode.COPY);
}
@@ -208,8 +207,8 @@ public class SendingLink_1_0 implements
name = UUID.randomUUID().toString();
}
- AMQQueue queue = _vhost.getAttainedQueue(name);
- ExchangeImpl exchange = exchangeDestination.getExchange();
+ Queue<?> queue = _vhost.getAttainedQueue(name);
+ Exchange<?> exchange = exchangeDestination.getExchange();
if(queue == null)
{
@@ -224,16 +223,16 @@ public class SendingLink_1_0 implements
}
else
{
- Collection<BindingImpl> bindings = queue.getBindings();
- List<BindingImpl> bindingsToRemove = new ArrayList<BindingImpl>();
- for(BindingImpl existingBinding : bindings)
+ Collection<? extends Binding<?>> bindings = queue.getBindings();
+ List<Binding<?>> bindingsToRemove = new ArrayList<>();
+ for(Binding<?> existingBinding : bindings)
{
if(existingBinding.getExchange() != exchange)
{
bindingsToRemove.add(existingBinding);
}
}
- for(BindingImpl existingBinding : bindingsToRemove)
+ for(Binding<?> existingBinding : bindingsToRemove)
{
existingBinding.delete();
}
@@ -430,7 +429,7 @@ public class SendingLink_1_0 implements
{
try
{
- _vhost.removeQueue((AMQQueue)_queue);
+ _vhost.removeQueue((Queue<?>)_queue);
}
catch (AccessControlException e)
{
@@ -702,7 +701,7 @@ public class SendingLink_1_0 implements
_closeAction = action;
}
- public VirtualHostImpl getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _vhost;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org