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 [4/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/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java Fri Dec 11 15:50:19 2015
@@ -48,7 +48,7 @@ public class VirtualHostNameAndLevelLogI
{
private VirtualHostLogger _virtualHostLogger;
private TaskExecutor _taskExecutor;
- private final VirtualHost<?,?,?> _virtualhost = mock(VirtualHost.class);
+ private final VirtualHost<?> _virtualhost = mock(VirtualHost.class);
@Override
public void setUp() throws Exception
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java Fri Dec 11 15:50:19 2015
@@ -21,14 +21,14 @@
package org.apache.qpid.server.logging.actors;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public abstract class BaseConnectionActorTestCase extends BaseActorTestCase
{
private AMQPConnection<?> _connection;
- private VirtualHostImpl _virtualHost;
+ private VirtualHost<?> _virtualHost;
@Override
public void setUp() throws Exception
@@ -39,7 +39,7 @@ public abstract class BaseConnectionActo
_virtualHost = BrokerTestHelper.createVirtualHost("test");
}
- public VirtualHostImpl getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java Fri Dec 11 15:50:19 2015
@@ -22,7 +22,7 @@ package org.apache.qpid.server.logging.m
import java.util.List;
-import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.util.BrokerTestHelper;
/**
@@ -32,7 +32,7 @@ public class ExchangeMessagesTest extend
{
public void testExchangeCreated_Transient() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
+ Exchange<?> exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
String type = exchange.getType();
String name = exchange.getName();
@@ -47,7 +47,7 @@ public class ExchangeMessagesTest extend
public void testExchangeCreated_Persistent() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", true, getEventLogger());
+ Exchange<?> exchange = BrokerTestHelper.createExchange("test", true, getEventLogger());
String type = exchange.getType();
String name = exchange.getName();
@@ -72,7 +72,7 @@ public class ExchangeMessagesTest extend
public void testExchangeDiscardedMessage() throws Exception
{
- ExchangeImpl exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
+ Exchange<?> exchange = BrokerTestHelper.createExchange("test", false, getEventLogger());
final String name = exchange.getName();
final String routingKey = "routingKey";
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Fri Dec 11 15:50:19 2015
@@ -23,14 +23,14 @@ package org.apache.qpid.server.logging.s
import java.util.List;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.UnitTestMessageLogger;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -152,7 +152,7 @@ public abstract class AbstractTestLogSub
* @param message The message to check
* @param queue The queue to check against
*/
- protected void verifyQueue(String message, AMQQueue queue)
+ protected void verifyQueue(String message, Queue<?> queue)
{
String queueSlice = getSlice("qu", message);
@@ -169,7 +169,7 @@ public abstract class AbstractTestLogSub
* @param message The message to check
* @param exchange the exchange to check against
*/
- protected void verifyExchange(String message, ExchangeImpl exchange)
+ protected void verifyExchange(String message, Exchange<?> exchange)
{
String exchangeSlice = getSlice("ex", message);
@@ -195,7 +195,7 @@ public abstract class AbstractTestLogSub
* @param message the message to search
* @param vhost the vhostName to check against
*/
- static public void verifyVirtualHost(String message, VirtualHostImpl vhost)
+ static public void verifyVirtualHost(String message, VirtualHost<?> vhost)
{
String vhostSlice = getSlice("vh", message);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java Fri Dec 11 15:50:19 2015
@@ -20,11 +20,10 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,10 +34,10 @@ import static org.mockito.Mockito.when;
public class BindingLogSubjectTest extends AbstractTestLogSubject
{
- private AMQQueue _queue;
+ private Queue<?> _queue;
private String _routingKey;
- private ExchangeImpl _exchange;
- private VirtualHostImpl _testVhost;
+ private Exchange<?> _exchange;
+ private VirtualHost _testVhost;
@Override
public void setUp() throws Exception
@@ -47,8 +46,8 @@ public class BindingLogSubjectTest exten
_testVhost = BrokerTestHelper.createVirtualHost("test");
_routingKey = "RoutingKey";
- _exchange = (ExchangeImpl) _testVhost.getChildByName(Exchange.class, "amq.direct");
- _queue = mock(AMQQueue.class);
+ _exchange = (Exchange<?>) _testVhost.getChildByName(Exchange.class, "amq.direct");
+ _queue = mock(Queue.class);
when(_queue.getName()).thenReturn("BindingLogSubjectTest");
when(_queue.getVirtualHost()).thenReturn(_testVhost);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java Fri Dec 11 15:50:19 2015
@@ -20,10 +20,9 @@
*/
package org.apache.qpid.server.logging.subjects;
-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.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
/**
@@ -31,8 +30,8 @@ import org.apache.qpid.server.virtualhos
*/
public class ExchangeLogSubjectTest extends AbstractTestLogSubject
{
- private ExchangeImpl _exchange;
- private VirtualHostImpl _testVhost;
+ private Exchange<?> _exchange;
+ private VirtualHost<?> _testVhost;
@Override
public void setUp() throws Exception
@@ -41,7 +40,7 @@ public class ExchangeLogSubjectTest exte
_testVhost = BrokerTestHelper.createVirtualHost("test");
- _exchange = (ExchangeImpl) _testVhost.getChildByName(Exchange.class, "amq.direct");
+ _exchange = (Exchange<?>) _testVhost.getChildByName(Exchange.class, "amq.direct");
_subject = new ExchangeLogSubject(_exchange,_testVhost);
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java Fri Dec 11 15:50:19 2015
@@ -20,15 +20,15 @@
*/
package org.apache.qpid.server.logging.subjects;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
/**
* Validate MessageStoreLogSubjects are logged as expected
*/
public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
{
- private VirtualHostImpl _testVhost;
+ private VirtualHost<?> _testVhost;
@Override
public void setUp() throws Exception
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java Fri Dec 11 15:50:19 2015
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -33,8 +33,8 @@ import static org.mockito.Mockito.when;
public class QueueLogSubjectTest extends AbstractTestLogSubject
{
- private AMQQueue _queue;
- private VirtualHostImpl _testVhost;
+ private Queue<?> _queue;
+ private VirtualHost _testVhost;
@Override
public void setUp() throws Exception
@@ -43,7 +43,7 @@ public class QueueLogSubjectTest extends
_testVhost = BrokerTestHelper.createVirtualHost("test");
- _queue = mock(AMQQueue.class);
+ _queue = mock(Queue.class);
when(_queue.getName()).thenReturn("QueueLogSubjectTest");
when(_queue.getVirtualHost()).thenReturn(_testVhost);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Fri Dec 11 15:50:19 2015
@@ -74,7 +74,7 @@ public class VirtualHostTest extends Qpi
private TaskExecutor _taskExecutor;
private VirtualHostNode _virtualHostNode;
private DurableConfigurationStore _configStore;
- private VirtualHost<?, ?, ?> _virtualHost;
+ private VirtualHost<?> _virtualHost;
private StoreConfigurationChangeListener _storeConfigurationChangeListener;
@Override
@@ -135,7 +135,7 @@ public class VirtualHostTest extends Qpi
public void testNewVirtualHost()
{
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertNotNull("Unexpected id", virtualHost.getId());
assertEquals("Unexpected name", virtualHostName, virtualHost.getName());
@@ -146,7 +146,7 @@ public class VirtualHostTest extends Qpi
public void testDeleteVirtualHost()
{
- VirtualHost<?,?,?> virtualHost = createVirtualHost(getName());
+ VirtualHost<?> virtualHost = createVirtualHost(getName());
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
virtualHost.delete();
@@ -159,7 +159,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
virtualHost.stop();
@@ -176,7 +176,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
final ConfiguredObjectRecord virtualHostCor = virtualHost.asObjectRecord();
@@ -230,7 +230,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?, ?, ?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
@@ -257,7 +257,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?, ?, ?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
@@ -287,7 +287,7 @@ public class VirtualHostTest extends Qpi
public void testCreateDurableQueue()
{
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
String queueName = "myQueue";
Map<String, Object> arguments = new HashMap<>();
@@ -304,7 +304,7 @@ public class VirtualHostTest extends Qpi
public void testCreateNonDurableQueue()
{
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
String queueName = "myQueue";
Map<String, Object> arguments = new HashMap<>();
@@ -325,7 +325,7 @@ public class VirtualHostTest extends Qpi
when(_broker.getSecurityManager()).thenReturn(_mockSecurityManager);
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
doThrow(new AccessControlException("mocked ACL exception")).when(_mockSecurityManager).authoriseUpdate(
virtualHost);
@@ -350,7 +350,7 @@ public class VirtualHostTest extends Qpi
when(_broker.getSecurityManager()).thenReturn(_mockSecurityManager);
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
doThrow(new AccessControlException("mocked ACL exception")).when(_mockSecurityManager).authoriseUpdate(
virtualHost);
@@ -373,7 +373,7 @@ public class VirtualHostTest extends Qpi
when(_broker.getSecurityManager()).thenReturn(_mockSecurityManager);
String virtualHostName = getName();
- VirtualHost<?,?,?> virtualHost = createVirtualHost(virtualHostName);
+ VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
doThrow(new AccessControlException("mocked ACL exception")).when(_mockSecurityManager).authoriseDelete(
virtualHost);
@@ -393,7 +393,7 @@ public class VirtualHostTest extends Qpi
public void testExistingConnectionBlocking()
{
- VirtualHost<?,?,?> host = createVirtualHost(getTestName());
+ VirtualHost<?> host = createVirtualHost(getTestName());
AbstractAMQPConnection connection = mock(AbstractAMQPConnection.class);
when(connection.getUnderlyingConnection()).thenReturn(connection);
host.registerConnection(connection);
@@ -434,7 +434,7 @@ public class VirtualHostTest extends Qpi
public void testChangeValidation() throws Exception
{
- VirtualHost<?,?,?> virtualHost = createVirtualHost(getTestName());
+ VirtualHost<?> virtualHost = createVirtualHost(getTestName());
try
{
virtualHost.setAttributes(Collections.<String, Object>singletonMap(VirtualHost.NUMBER_OF_SELECTORS, "-1"));
@@ -465,12 +465,12 @@ public class VirtualHostTest extends Qpi
}
}
- private VirtualHost<?,?,?> createVirtualHost(final String virtualHostName)
+ private VirtualHost<?> createVirtualHost(final String virtualHostName)
{
return createVirtualHost(virtualHostName, Collections.<String, Object>emptyMap());
}
- private VirtualHost<?,?,?> createVirtualHost(final String virtualHostName, Map<String,Object> attributes)
+ private VirtualHost<?> createVirtualHost(final String virtualHostName, Map<String,Object> attributes)
{
Map<String, Object> vhAttributes = new HashMap<>();
vhAttributes.put(VirtualHost.NAME, virtualHostName);
@@ -486,7 +486,7 @@ public class VirtualHostTest extends Qpi
return host;
}
- private AbstractAMQPConnection createMockProtocolConnection(final VirtualHost<?, ?, ?> virtualHost)
+ private AbstractAMQPConnection createMockProtocolConnection(final VirtualHost<?> virtualHost)
{
final AbstractAMQPConnection connection = mock(AbstractAMQPConnection.class);
final List<Action<?>> tasks = new ArrayList<>();
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Fri Dec 11 15:50:19 2015
@@ -40,7 +40,9 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.util.StateChangeListener;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
@@ -49,7 +51,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.consumer.MockConsumer;
import org.apache.qpid.server.exchange.DirectExchange;
@@ -65,7 +66,6 @@ import org.apache.qpid.server.queue.Abst
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
abstract class AbstractQueueTestBase extends QpidTestCase
@@ -73,8 +73,8 @@ abstract class AbstractQueueTestBase ext
private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class);
- private AMQQueue<?> _queue;
- private VirtualHostImpl _virtualHost;
+ private Queue<?> _queue;
+ private VirtualHost<?> _virtualHost;
private String _qname = "qname";
private String _owner = "owner";
private String _routingKey = "routing key";
@@ -154,7 +154,7 @@ abstract class AbstractQueueTestBase ext
_exchange.isBound(_routingKey,_queue));
assertEquals("Exchange binding count", 1,
_queue.getBindings().size());
- final BindingImpl firstBinding = _queue.getBindings().iterator().next();
+ final Binding<?> firstBinding = _queue.getBindings().iterator().next();
assertEquals("Wrong exchange bound", _routingKey,
firstBinding.getBindingKey());
assertEquals("Wrong exchange bound", _exchange,
@@ -837,7 +837,7 @@ abstract class AbstractQueueTestBase ext
attributes.put(Queue.NAME,"testTtlOverrideMaximumTTl");
attributes.put(Queue.MAXIMUM_MESSAGE_TTL, 10000l);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("TTL has not been overridden", 60000l, getExpirationOnQueue(queue, 50000l, 0l));
@@ -897,7 +897,7 @@ abstract class AbstractQueueTestBase ext
public void testOldestMessage()
{
- AMQQueue<?> queue = getQueue();
+ Queue<?> queue = getQueue();
queue.enqueue(createMessage(1l, (byte)1, Collections.singletonMap("sortKey", (Object) "Z"), 10l), null, null);
queue.enqueue(createMessage(2l, (byte)4, Collections.singletonMap("sortKey", (Object) "M"), 100l), null, null);
queue.enqueue(createMessage(3l, (byte)9, Collections.singletonMap("sortKey", (Object) "A"), 1000l), null, null);
@@ -905,7 +905,7 @@ abstract class AbstractQueueTestBase ext
assertEquals(10l,queue.getOldestMessageArrivalTime());
}
- private long getExpirationOnQueue(final AMQQueue queue, long arrivalTime, long expiration)
+ private long getExpirationOnQueue(final Queue<?> queue, long arrivalTime, long expiration)
{
final List<QueueEntry> entries = new ArrayList<>();
@@ -942,7 +942,7 @@ abstract class AbstractQueueTestBase ext
* @param messageNumber
* number of messages to put into queue
*/
- protected List<? extends QueueEntry> enqueueGivenNumberOfMessages(AMQQueue<?> queue, int messageNumber)
+ protected List<? extends QueueEntry> enqueueGivenNumberOfMessages(Queue<?> queue, int messageNumber)
{
putGivenNumberOfMessages(queue, messageNumber);
@@ -968,7 +968,7 @@ abstract class AbstractQueueTestBase ext
* @param queue
* @param messageNumber
*/
- protected void putGivenNumberOfMessages(AMQQueue<?> queue, int messageNumber)
+ protected void putGivenNumberOfMessages(Queue<?> queue, int messageNumber)
{
for (int i = 0; i < messageNumber; i++)
{
@@ -998,7 +998,7 @@ abstract class AbstractQueueTestBase ext
* @param dequeueMessageIndex
* entry index to dequeue.
*/
- protected QueueEntry dequeueMessage(AMQQueue<?> queue, int dequeueMessageIndex)
+ protected QueueEntry dequeueMessage(Queue<?> queue, int dequeueMessageIndex)
{
List<? extends QueueEntry> entries = queue.getMessagesOnTheQueue();
QueueEntry entry = entries.get(dequeueMessageIndex);
@@ -1021,12 +1021,12 @@ abstract class AbstractQueueTestBase ext
}
}
- public AMQQueue<?> getQueue()
+ public Queue<?> getQueue()
{
return _queue;
}
- protected void setQueue(AMQQueue<?> queue)
+ protected void setQueue(Queue<?> queue)
{
_queue = queue;
}
@@ -1123,7 +1123,7 @@ abstract class AbstractQueueTestBase ext
}
- public VirtualHostImpl getVirtualHost()
+ public VirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueListTest.java Fri Dec 11 15:50:19 2015
@@ -38,9 +38,9 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class LastValueQueueListTest extends QpidTestCase
@@ -62,7 +62,7 @@ public class LastValueQueueListTest exte
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
queueAttributes.put(LastValueQueue.LVQ_KEY, CONFLATION_KEY);
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
@@ -238,10 +238,10 @@ public class LastValueQueueListTest exte
return mockMessage;
}
- private AMQQueue createTestQueue()
+ private Queue<?> createTestQueue()
{
- AMQQueue queue = mock(AMQQueue.class);
- VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ Queue<?> queue = mock(Queue.class);
+ VirtualHost virtualHost = mock(VirtualHost.class);
when(queue.getVirtualHost()).thenReturn(virtualHost);
return queue;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java Fri Dec 11 15:50:19 2015
@@ -42,7 +42,7 @@ public class LastValueQueueTest extends
public void testOldestMessage()
{
- AMQQueue<?> queue = getQueue();
+ Queue<?> queue = getQueue();
queue.enqueue(createMessage(1l, (byte)1, Collections.singletonMap("lvqKey", (Object) "Z"), 10l), null, null);
assertEquals(10l,queue.getOldestMessageArrivalTime());
queue.enqueue(createMessage(2l, (byte)4, Collections.singletonMap("lvqKey", (Object) "M"), 100l), null, null);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java Fri Dec 11 15:50:19 2015
@@ -34,6 +34,7 @@ import static org.apache.qpid.server.que
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.QueueNotificationListener;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -41,7 +42,7 @@ public class NotificationCheckTest exten
{
private ServerMessage<?> _message = mock(ServerMessage.class);
- private AMQQueue _queue = mock(AMQQueue.class);
+ private Queue<?> _queue = mock(Queue.class);
private QueueNotificationListener _listener = mock(QueueNotificationListener .class);
public void testMessageCountAlertFires() throws Exception
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java Fri Dec 11 15:50:19 2015
@@ -39,10 +39,10 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class PriorityQueueListTest extends QpidTestCase
@@ -63,7 +63,7 @@ public class PriorityQueueListTest exten
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
queueAttributes.put(PriorityQueue.PRIORITIES, 10);
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Fri Dec 11 15:50:19 2015
@@ -39,8 +39,8 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -239,7 +239,7 @@ public abstract class QueueEntryImplTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Fri Dec 11 15:50:19 2015
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -45,7 +46,7 @@ public abstract class QueueEntryListTest
assertEquals("Unexpected head entry returned by getHead()", getTestList().getQueue(), getTestQueue());
}
- protected abstract AMQQueue getTestQueue();
+ protected abstract Queue<?> getTestQueue();
/**
* Test to add a message with properties specific to the queue type.
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/QueueMessageRecoveryTest.java Fri Dec 11 15:50:19 2015
@@ -34,17 +34,17 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class QueueMessageRecoveryTest extends QpidTestCase
{
- VirtualHostImpl<?, ?, ?> _vhost;
+ VirtualHost<?> _vhost;
@Override
public void setUp() throws Exception
@@ -195,7 +195,7 @@ public class QueueMessageRecoveryTest ex
private final List<ServerMessage<?>> _messageList;
protected TestQueue(final Map<String, Object> attributes,
- final VirtualHostImpl virtualHost,
+ final VirtualHost<?> virtualHost,
final List<ServerMessage<?>> messageList)
{
super(attributes, virtualHost);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Fri Dec 11 15:50:19 2015
@@ -38,8 +38,8 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
{
@@ -52,7 +52,7 @@ public class SimpleQueueEntryImplTest ex
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, "SimpleQueueEntryImplTest");
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Fri Dec 11 15:50:19 2015
@@ -42,9 +42,9 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class SortedQueueEntryListTest extends QueueEntryListTestBase
{
@@ -91,7 +91,7 @@ public class SortedQueueEntryListTest ex
attributes.put(SortedQueue.SORT_KEY, "KEY");
// Create test list
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java Fri Dec 11 15:50:19 2015
@@ -41,8 +41,8 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class SortedQueueEntryTest extends QueueEntryImplTestBase
{
@@ -61,7 +61,7 @@ public class SortedQueueEntryTest extend
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT);
attributes.put(SortedQueue.SORT_KEY, "KEY");
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java Fri Dec 11 15:50:19 2015
@@ -39,9 +39,9 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class StandardQueueEntryListTest extends QueueEntryListTestBase
{
@@ -61,7 +61,7 @@ public class StandardQueueEntryListTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
_factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
@@ -115,7 +115,7 @@ public class StandardQueueEntryListTest
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
queueAttributes.put(Queue.NAME, getName());
- final VirtualHostImpl virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(virtualHost.getEventLogger()).thenReturn(new EventLogger());
when(virtualHost.getObjectFactory()).thenReturn(_factory);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java Fri Dec 11 15:50:19 2015
@@ -20,9 +20,7 @@
*/
package org.apache.qpid.server.queue;
-import java.security.AccessControlContext;
import java.security.AccessController;
-import java.security.Principal;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
@@ -38,8 +36,8 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageEnqueueRecord;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import static org.mockito.Mockito.mock;
@@ -248,7 +246,7 @@ public class StandardQueueTest extends A
private QueueEntryList _entries = new DequeuedQueueEntryList(this);
- public DequeuedQueue(VirtualHostImpl virtualHost)
+ public DequeuedQueue(VirtualHost<?> virtualHost)
{
super(attributes(), virtualHost);
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java Fri Dec 11 15:50:19 2015
@@ -78,7 +78,7 @@ public class SecurityManagerTest extends
private AccessControl _accessControl;
private SecurityManager _securityManager;
- private VirtualHost<?,?,?> _virtualHost;
+ private VirtualHost<?> _virtualHost;
private Broker _broker;
private VirtualHostNode<?> _virtualHostNode;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Fri Dec 11 15:50:19 2015
@@ -43,7 +43,6 @@ import org.apache.qpid.common.AMQPFilter
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
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.model.Binding;
import org.apache.qpid.server.model.BrokerModel;
@@ -57,11 +56,9 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.util.FileUtils;
@@ -145,7 +142,7 @@ public abstract class AbstractDurableCon
public void testCreateExchange() throws Exception
{
- ExchangeImpl exchange = createTestExchange();
+ Exchange<?> exchange = createTestExchange();
_configStore.create(exchange.asObjectRecord());
reopenStore();
@@ -179,7 +176,7 @@ public abstract class AbstractDurableCon
public void testRemoveExchange() throws Exception
{
- ExchangeImpl exchange = createTestExchange();
+ Exchange<?> exchange = createTestExchange();
_configStore.create(exchange.asObjectRecord());
_configStore.remove(exchange.asObjectRecord());
@@ -190,8 +187,8 @@ public abstract class AbstractDurableCon
public void testBindQueue() throws Exception
{
- ExchangeImpl<?> exchange = createTestExchange();
- AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
+ Exchange<?> exchange = createTestExchange();
+ Queue<?> queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
BindingImpl binding = createBinding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
exchange, _bindingArgs);
_configStore.create(exchange.asObjectRecord());
@@ -284,10 +281,10 @@ public abstract class AbstractDurableCon
public void testUnbindQueue() throws Exception
{
- ExchangeImpl<?> exchange = createTestExchange();
+ Exchange<?> exchange = createTestExchange();
_configStore.create(exchange.asObjectRecord());
- AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
+ Queue<?> queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
BindingImpl binding = createBinding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
exchange, _bindingArgs);
_configStore.create(binding.asObjectRecord());
@@ -301,7 +298,7 @@ public abstract class AbstractDurableCon
public void testCreateQueueAMQQueue() throws Exception
{
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, null);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, null);
_configStore.create(queue.asObjectRecord());
reopenStore();
@@ -321,7 +318,7 @@ public abstract class AbstractDurableCon
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
attributes.put(Queue.TYPE, STANDARD);
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
_configStore.create(queue.asObjectRecord());
@@ -340,9 +337,9 @@ public abstract class AbstractDurableCon
public void testCreateQueueAMQQueueWithAlternateExchange() throws Exception
{
- ExchangeImpl alternateExchange = createTestAlternateExchange();
+ Exchange<?> alternateExchange = createTestAlternateExchange();
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange, null);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange, null);
_configStore.create(queue.asObjectRecord());
reopenStore();
@@ -357,10 +354,10 @@ public abstract class AbstractDurableCon
verify(_handler).handle(matchesRecord(_queueId, QUEUE, queueAttributes));
}
- private ExchangeImpl createTestAlternateExchange()
+ private Exchange<?> createTestAlternateExchange()
{
UUID exchUuid = UUID.randomUUID();
- ExchangeImpl alternateExchange = mock(ExchangeImpl.class);
+ Exchange<?> alternateExchange = mock(Exchange.class);
when(alternateExchange.getId()).thenReturn(exchUuid);
return alternateExchange;
}
@@ -372,7 +369,7 @@ public abstract class AbstractDurableCon
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
attributes.put(Queue.TYPE, STANDARD);
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
_configStore.create(queue.asObjectRecord());
@@ -399,11 +396,11 @@ public abstract class AbstractDurableCon
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
_configStore.create(queue.asObjectRecord());
// update the queue to have exclusive=false
- ExchangeImpl alternateExchange = createTestAlternateExchange();
+ Exchange<?> alternateExchange = createTestAlternateExchange();
queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange, attributes);
_configStore.update(false, queue.asObjectRecord());
@@ -426,7 +423,7 @@ public abstract class AbstractDurableCon
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
- AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
+ Queue<?> queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
_configStore.create(queue.asObjectRecord());
// remove queue
@@ -435,7 +432,7 @@ public abstract class AbstractDurableCon
verify(_handler, never()).handle(any(ConfiguredObjectRecord.class));
}
- private AMQQueue createTestQueue(String queueName,
+ private Queue<?> createTestQueue(String queueName,
String queueOwner,
boolean exclusive,
final Map<String, Object> arguments) throws StoreException
@@ -443,13 +440,13 @@ public abstract class AbstractDurableCon
return createTestQueue(queueName, queueOwner, exclusive, null, arguments);
}
- private AMQQueue createTestQueue(String queueName,
+ private Queue<?> createTestQueue(String queueName,
String queueOwner,
boolean exclusive,
- ExchangeImpl alternateExchange,
+ Exchange<?> alternateExchange,
final Map<String, Object> arguments) throws StoreException
{
- AMQQueue<?> queue = mock(AMQQueue.class);
+ Queue<?> queue = mock(Queue.class);
when(queue.getName()).thenReturn(queueName);
when(queue.isExclusive()).thenReturn(exclusive);
when(queue.getId()).thenReturn(_queueId);
@@ -461,7 +458,7 @@ public abstract class AbstractDurableCon
when(queue.getTaskExecutor()).thenReturn(taskExecutor);
when(queue.getChildExecutor()).thenReturn(taskExecutor);
- final VirtualHostImpl vh = mock(VirtualHostImpl.class);
+ final VirtualHost vh = mock(VirtualHost.class);
when(vh.getSecurityManager()).thenReturn(mock(SecurityManager.class));
when(queue.getVirtualHost()).thenReturn(vh);
final Map<String,Object> attributes = arguments == null ? new LinkedHashMap<String, Object>() : new LinkedHashMap<String, Object>(arguments);
@@ -505,9 +502,9 @@ public abstract class AbstractDurableCon
return queue;
}
- private ExchangeImpl createTestExchange()
+ private Exchange<?> createTestExchange()
{
- ExchangeImpl exchange = mock(ExchangeImpl.class);
+ Exchange exchange = mock(Exchange.class);
Map<String,Object> actualAttributes = new HashMap<String, Object>();
actualAttributes.put("name", getName());
actualAttributes.put("type", getName() + "Type");
@@ -553,8 +550,8 @@ public abstract class AbstractDurableCon
private static BindingImpl createBinding(UUID id,
final String bindingKey,
- final AMQQueue queue,
- final ExchangeImpl exchange,
+ final Queue<?> queue,
+ final Exchange<?> exchange,
final Map<String, Object> arguments)
{
Map<String, Object> attributes = new HashMap<String, Object>();
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java Fri Dec 11 15:50:19 2015
@@ -120,7 +120,7 @@ public class VirtualHostStoreUpgraderAnd
VirtualHostStoreUpgraderAndRecoverer upgraderAndRecoverer = new VirtualHostStoreUpgraderAndRecoverer(_virtualHostNode);
upgraderAndRecoverer.perform(_durableConfigurationStore);
- final VirtualHost<?,?,?> host = _virtualHostNode.getVirtualHost();
+ final VirtualHost<?> host = _virtualHostNode.getVirtualHost();
Subject.doAs(org.apache.qpid.server.security.SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<Void>()
{
@Override
@@ -163,7 +163,7 @@ public class VirtualHostStoreUpgraderAnd
VirtualHostStoreUpgraderAndRecoverer upgraderAndRecoverer = new VirtualHostStoreUpgraderAndRecoverer(_virtualHostNode);
upgraderAndRecoverer.perform(_durableConfigurationStore);
- final VirtualHost<?,?,?> host = _virtualHostNode.getVirtualHost();
+ final VirtualHost<?> host = _virtualHostNode.getVirtualHost();
Subject.doAs(org.apache.qpid.server.security.SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<Void>()
{
@Override
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Fri Dec 11 15:50:19 2015
@@ -31,7 +31,6 @@ import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
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.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
@@ -44,14 +43,12 @@ import org.apache.qpid.server.model.UUID
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.QueueExistsException;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class BrokerTestHelper
@@ -118,15 +115,15 @@ public class BrokerTestHelper
{
}
- public static VirtualHostImpl<?,?,?> createVirtualHost(Map<String, Object> attributes)
+ public static VirtualHost<?> createVirtualHost(Map<String, Object> attributes)
{
Broker<?> broker = createBrokerMock();
return createVirtualHost(attributes, broker, false);
}
- private static VirtualHostImpl<?, ?, ?> createVirtualHost(final Map<String, Object> attributes,
- final Broker<?> broker, boolean defaultVHN)
+ private static VirtualHost<?> createVirtualHost(final Map<String, Object> attributes,
+ final Broker<?> broker, boolean defaultVHN)
{
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
@@ -163,12 +160,12 @@ public class BrokerTestHelper
return host;
}
- public static VirtualHostImpl<?,?,?> createVirtualHost(String name) throws Exception
+ public static VirtualHost<?> createVirtualHost(String name) throws Exception
{
return createVirtualHost(name, createBrokerMock(), false);
}
- public static VirtualHostImpl<?,?,?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN) throws Exception
+ public static VirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN) throws Exception
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(org.apache.qpid.server.model.VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
@@ -207,13 +204,13 @@ public class BrokerTestHelper
return mock(AMQPConnection.class);
}
- public static ExchangeImpl<?> createExchange(String hostName, final boolean durable, final EventLogger eventLogger) throws Exception
+ public static Exchange<?> createExchange(String hostName, final boolean durable, final EventLogger eventLogger) throws Exception
{
Broker broker = mock(Broker.class);
when(broker.getModel()).thenReturn(BrokerModel.getInstance());
when(broker.getCategoryClass()).thenReturn(Broker.class);
SecurityManager securityManager = new SecurityManager(broker, false);
- final VirtualHostImpl<?,?,?> virtualHost = mock(VirtualHostImpl.class);
+ final VirtualHost<?> virtualHost = mock(VirtualHost.class);
when(virtualHost.getName()).thenReturn(hostName);
when(virtualHost.getSecurityManager()).thenReturn(securityManager);
when(virtualHost.getEventLogger()).thenReturn(eventLogger);
@@ -228,25 +225,25 @@ public class BrokerTestHelper
attributes.put(org.apache.qpid.server.model.Exchange.NAME, "amq.direct");
attributes.put(org.apache.qpid.server.model.Exchange.TYPE, "direct");
attributes.put(org.apache.qpid.server.model.Exchange.DURABLE, durable);
- return Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<ExchangeImpl>()
+ return Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<Exchange<?>>()
{
@Override
- public ExchangeImpl run()
+ public Exchange<?> run()
{
- return (ExchangeImpl) objectFactory.create(Exchange.class, attributes, virtualHost);
+ return (Exchange<?>) objectFactory.create(Exchange.class, attributes, virtualHost);
}
});
}
- public static AMQQueue<?> createQueue(String queueName, VirtualHostImpl<?,?,?> virtualHost)
+ public static Queue<?> createQueue(String queueName, VirtualHost<?> virtualHost)
throws QueueExistsException
{
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUIDGenerator.generateRandomUUID());
attributes.put(Queue.NAME, queueName);
- AMQQueue<?> queue = virtualHost.createQueue(attributes);
+ Queue<?> queue = virtualHost.createQueue(attributes);
return queue;
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecovererTest.java Fri Dec 11 15:50:19 2015
@@ -26,15 +26,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Collections;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.logging.EventLogger;
-import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.store.handler.MessageInstanceHandler;
@@ -43,7 +41,7 @@ import org.apache.qpid.test.utils.QpidTe
public class AsynchronousMessageStoreRecovererTest extends QpidTestCase
{
- private VirtualHostImpl _virtualHost;
+ private VirtualHost _virtualHost;
private MessageStore _store;
private MessageStore.MessageStoreReader _storeReader;
@@ -52,7 +50,7 @@ public class AsynchronousMessageStoreRec
{
super.setUp();
- _virtualHost = mock(VirtualHostImpl.class);
+ _virtualHost = mock(VirtualHost.class);
_store = mock(MessageStore.class);
_storeReader = mock(MessageStore.MessageStoreReader.class);
@@ -66,7 +64,7 @@ public class AsynchronousMessageStoreRec
ServerScopedRuntimeException exception = new ServerScopedRuntimeException("test");
doThrow(exception).when(_storeReader).visitMessageInstances(any(TransactionLogResource.class),
any(MessageInstanceHandler.class));
- AMQQueue queue = mock(AMQQueue.class);
+ Queue<?> queue = mock(Queue.class);
when(_virtualHost.getQueues()).thenReturn(Collections.singleton(queue));
AsynchronousMessageStoreRecoverer recoverer = new AsynchronousMessageStoreRecoverer();
@@ -84,7 +82,7 @@ public class AsynchronousMessageStoreRec
public void testRecoveryEmptyQueue() throws Exception
{
- AMQQueue queue = mock(AMQQueue.class);
+ Queue<?> queue = mock(Queue.class);
when(_virtualHost.getQueues()).thenReturn(Collections.singleton(queue));
AsynchronousMessageStoreRecoverer recoverer = new AsynchronousMessageStoreRecoverer();
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Fri Dec 11 15:50:19 2015
@@ -32,6 +32,8 @@ import static org.mockito.Mockito.when;
import java.util.UUID;
+import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.ArgumentMatcher;
@@ -39,7 +41,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.message.EnqueueableMessage;
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.queue.QueueEntry;
import org.apache.qpid.server.store.MessageDurability;
import org.apache.qpid.server.store.MessageEnqueueRecord;
@@ -62,14 +63,14 @@ import org.apache.qpid.transport.Xid;
public class SynchronousMessageStoreRecovererTest extends QpidTestCase
{
- private VirtualHostImpl _virtualHost;
+ private VirtualHost<?> _virtualHost;
@Override
protected void setUp() throws Exception
{
super.setUp();
- _virtualHost = mock(VirtualHostImpl.class);
+ _virtualHost = mock(VirtualHost.class);
when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
}
@@ -77,7 +78,7 @@ public class SynchronousMessageStoreReco
@SuppressWarnings("unchecked")
public void testRecoveryOfSingleMessageOnSingleQueue()
{
- final AMQQueue<?> queue = createRegisteredMockQueue();
+ final Queue<?> queue = createRegisteredMockQueue();
final long messageId = 1;
final StoredMessage<StorableMessageMetaData> storedMessage = createMockStoredMessage(messageId);
@@ -110,7 +111,7 @@ public class SynchronousMessageStoreReco
@SuppressWarnings("unchecked")
public void testRecoveryOfMessageInstanceForNonExistingMessage()
{
- final AMQQueue<?> queue = createRegisteredMockQueue();
+ final Queue<?> queue = createRegisteredMockQueue();
final long messageId = 1;
final Transaction transaction = mock(Transaction.class);
@@ -218,7 +219,7 @@ public class SynchronousMessageStoreReco
@SuppressWarnings("unchecked")
public void testRecoveryOfSingleEnqueueWithDistributedTransaction()
{
- AMQQueue<?> queue = createRegisteredMockQueue();
+ Queue<?> queue = createRegisteredMockQueue();
final Transaction transaction = mock(Transaction.class);
@@ -301,7 +302,7 @@ public class SynchronousMessageStoreReco
public void testRecoveryOfSingleDequeueWithDistributedTransaction()
{
final UUID queueId = UUID.randomUUID();
- final AMQQueue<?> queue = createRegisteredMockQueue(queueId);
+ final Queue<?> queue = createRegisteredMockQueue(queueId);
final Transaction transaction = mock(Transaction.class);
@@ -385,7 +386,7 @@ public class SynchronousMessageStoreReco
}
- protected EnqueueRecord createMockRecord(AMQQueue<?> queue, EnqueueableMessage enqueueableMessage)
+ protected EnqueueRecord createMockRecord(Queue<?> queue, EnqueueableMessage enqueueableMessage)
{
EnqueueRecord enqueueRecord = mock(EnqueueRecord.class);
when(enqueueRecord.getMessage()).thenReturn(enqueueableMessage);
@@ -424,14 +425,14 @@ public class SynchronousMessageStoreReco
return storedMessage;
}
- private AMQQueue<?> createRegisteredMockQueue()
+ private Queue<?> createRegisteredMockQueue()
{
return createRegisteredMockQueue(UUID.randomUUID());
}
- private AMQQueue<?> createRegisteredMockQueue(UUID queueId)
+ private Queue<?> createRegisteredMockQueue(UUID queueId)
{
- AMQQueue<?> queue = mock(AMQQueue.class);
+ Queue queue = mock(Queue.class);
when(queue.getMessageDurability()).thenReturn(MessageDurability.DEFAULT);
when(queue.getId()).thenReturn(queueId);
when(queue.getName()).thenReturn("test-queue");
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java Fri Dec 11 15:50:19 2015
@@ -31,7 +31,6 @@ import org.apache.qpid.exchange.Exchange
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
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.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
@@ -43,7 +42,6 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.PriorityQueue;
import org.apache.qpid.server.queue.PriorityQueueImpl;
import org.apache.qpid.server.queue.StandardQueueImpl;
@@ -53,7 +51,7 @@ import org.apache.qpid.test.utils.QpidTe
public class VirtualHostQueueCreationTest extends QpidTestCase
{
- private VirtualHostImpl<?,?,?> _virtualHost;
+ private VirtualHost<?> _virtualHost;
private VirtualHostNode<?> _virtualHostNode;
private TaskExecutor _taskExecutor;
@@ -106,7 +104,7 @@ public class VirtualHostQueueCreationTes
super.tearDown();
}
}
- private VirtualHostImpl<?,?,?> createHost()
+ private VirtualHost<?> createHost()
{
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(VirtualHost.NAME, getName());
@@ -140,7 +138,7 @@ public class VirtualHostQueueCreationTes
attributes.put(PriorityQueue.PRIORITIES, 5);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("Queue not a priority queue", PriorityQueueImpl.class, queue.getClass());
verifyQueueRegistered("testPriorityQueue");
@@ -158,7 +156,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.NAME, queueName);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("Queue not a simple queue", StandardQueueImpl.class, queue.getClass());
verifyQueueRegistered(queueName);
@@ -178,7 +176,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueEnabled";
- String dlExchangeName = queueName + VirtualHostImpl.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -190,9 +188,9 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.NAME, queueName);
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, true);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
- Exchange altExchange = queue.getAlternateExchange();
+ Exchange<?> altExchange = queue.getAlternateExchange();
assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType());
@@ -200,9 +198,9 @@ public class VirtualHostQueueCreationTes
assertNotNull("The alternate exchange was not registered as expected", _virtualHost.getChildByName(Exchange.class, dlExchangeName));
assertEquals("The registered exchange was not the expected exchange instance", altExchange, _virtualHost.getChildByName(Exchange.class, dlExchangeName));
- AMQQueue dlQueue = (AMQQueue) _virtualHost.getChildByName(Queue.class, dlQueueName);
+ Queue<?> dlQueue = (Queue<?>) _virtualHost.getChildByName(Queue.class, dlQueueName);
assertNotNull("The DLQ was not registered as expected", dlQueue);
- assertTrue("DLQ should have been bound to the alternate exchange", ((ExchangeImpl)altExchange).isBound(dlQueue));
+ assertTrue("DLQ should have been bound to the alternate exchange", altExchange.isBound(dlQueue));
assertNull("DLQ should have no alternate exchange", dlQueue.getAlternateExchange());
assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryAttempts());
@@ -218,7 +216,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueEnabled";
- String dlExchangeName = queueName + VirtualHostImpl.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -230,10 +228,10 @@ public class VirtualHostQueueCreationTes
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, true);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 5);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryAttempts());
- Exchange altExchange = queue.getAlternateExchange();
+ Exchange<?> altExchange = queue.getAlternateExchange();
assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType());
@@ -241,9 +239,9 @@ public class VirtualHostQueueCreationTes
assertNotNull("The alternate exchange was not registered as expected", _virtualHost.getChildByName(Exchange.class, dlExchangeName));
assertEquals("The registered exchange was not the expected exchange instance", altExchange, _virtualHost.getChildByName(Exchange.class, dlExchangeName));
- AMQQueue dlQueue = (AMQQueue) _virtualHost.getChildByName(Queue.class, dlQueueName);
+ Queue<?> dlQueue = (Queue<?>) _virtualHost.getChildByName(Queue.class, dlQueueName);
assertNotNull("The DLQ was not registered as expected", dlQueue);
- assertTrue("DLQ should have been bound to the alternate exchange", ((ExchangeImpl)altExchange).isBound(dlQueue));
+ assertTrue("DLQ should have been bound to the alternate exchange", altExchange.isBound(dlQueue));
assertNull("DLQ should have no alternate exchange", dlQueue.getAlternateExchange());
assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryAttempts());
@@ -261,7 +259,7 @@ public class VirtualHostQueueCreationTes
String queueName = "testDeadLetterQueueDisabled";
- String dlExchangeName = queueName + VirtualHostImpl.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -272,7 +270,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.NAME, queueName);
attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, false);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertNull("Queue should not have an alternate exchange as DLQ is disabled", queue.getAlternateExchange());
assertNull("The alternate exchange should still not exist", _virtualHost.getChildByName(Exchange.class, dlExchangeName));
@@ -291,7 +289,7 @@ public class VirtualHostQueueCreationTes
{
String queueName = "testDeadLetterQueueNotCreatedForAutodeleteQueues";
- String dlExchangeName = queueName + VirtualHostImpl.DEFAULT_DLE_NAME_SUFFIX;
+ String dlExchangeName = queueName + VirtualHost.DEFAULT_DLE_NAME_SUFFIX;
String dlQueueName = queueName + AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX;
assertNull("The DLQ should not yet exist", _virtualHost.getChildByName(Queue.class, dlQueueName));
@@ -305,7 +303,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.LIFETIME_POLICY, LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS);
//create an autodelete queue
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("Queue should be autodelete",
LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS,
queue.getLifetimePolicy());
@@ -331,7 +329,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, (Object) 5);
- final AMQQueue queue = _virtualHost.createQueue(attributes);
+ final Queue<?> queue = _virtualHost.createQueue(attributes);
assertNotNull("The queue was not registered as expected ", queue);
assertEquals("Maximum delivery count not as expected", 5, queue.getMaximumDeliveryAttempts());
@@ -349,7 +347,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.ID, UUID.randomUUID());
attributes.put(Queue.NAME, "testMaximumDeliveryCountDefault");
- final AMQQueue queue = _virtualHost.createQueue(attributes);
+ final Queue<?> queue = _virtualHost.createQueue(attributes);
assertNotNull("The queue was not registered as expected ", queue);
assertEquals("Maximum delivery count not as expected", 0, queue.getMaximumDeliveryAttempts());
@@ -446,7 +444,7 @@ public class VirtualHostQueueCreationTes
attributes.put(Queue.MESSAGE_GROUP_KEY,"mykey");
attributes.put(Queue.MESSAGE_GROUP_SHARED_GROUPS, true);
- AMQQueue queue = _virtualHost.createQueue(attributes);
+ Queue<?> queue = _virtualHost.createQueue(attributes);
assertEquals("mykey", queue.getAttribute(Queue.MESSAGE_GROUP_KEY));
assertEquals(Boolean.TRUE, queue.getAttribute(Queue.MESSAGE_GROUP_SHARED_GROUPS));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org