Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java Fri Dec 11 15:50:19 2015 @@ -23,12 +23,12 @@ package org.apache.qpid.server.txn; import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.MessageInstance; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.store.MessageEnqueueRecord; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.TransactionLogResource; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.Xid; import java.util.Collection; @@ -41,10 +41,10 @@ public class DistributedTransaction impl private DtxBranch _branch; private AMQSessionModel _session; - private VirtualHostImpl _vhost; + private VirtualHost<?> _vhost; - public DistributedTransaction(AMQSessionModel session, MessageStore store, VirtualHostImpl vhost) + public DistributedTransaction(AMQSessionModel session, MessageStore store, VirtualHost<?> vhost) { _session = session; _vhost = vhost;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java Fri Dec 11 15:50:19 2015 @@ -31,6 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.message.EnqueueableMessage; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.store.MessageEnqueueRecord; import org.apache.qpid.server.store.MessageStore; @@ -38,7 +39,6 @@ import org.apache.qpid.server.store.Stor import org.apache.qpid.server.store.Transaction; import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.util.Action; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.transport.Xid; public class DtxBranch @@ -55,7 +55,7 @@ public class DtxBranch private Transaction _transaction; private long _expiration; - private VirtualHostImpl _vhost; + private VirtualHost<?> _vhost; private ScheduledFuture<?> _timeoutFuture; private MessageStore _store; private Transaction.StoredXidRecord _storedXidRecord; @@ -73,14 +73,14 @@ public class DtxBranch ROLLBACK_ONLY } - public DtxBranch(Xid xid, MessageStore store, VirtualHostImpl vhost) + public DtxBranch(Xid xid, MessageStore store, VirtualHost<?> vhost) { _xid = xid; _store = store; _vhost = vhost; } - public DtxBranch(Transaction.StoredXidRecord storedXidRecord, MessageStore store, VirtualHostImpl vhost) + public DtxBranch(Transaction.StoredXidRecord storedXidRecord, MessageStore store, VirtualHost<?> vhost) { this(new Xid(storedXidRecord.getFormat(), storedXidRecord.getGlobalId(), storedXidRecord.getBranchId()), store, vhost); _storedXidRecord = storedXidRecord; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractSystemMessageSource.java Fri Dec 11 15:50:19 2015 @@ -52,11 +52,11 @@ public abstract class AbstractSystemMess { protected final UUID _id; protected final String _name; - protected final VirtualHost<?, ?, ?> _virtualHost; + protected final VirtualHost<?> _virtualHost; private List<Consumer> _consumers = new CopyOnWriteArrayList<>(); public AbstractSystemMessageSource( - String name, final VirtualHost<?, ?, ?> virtualHost) + String name, final VirtualHost<?> virtualHost) { _name = name; _id = UUID.nameUUIDFromBytes((getClass().getSimpleName() + "/" + virtualHost.getName() + "/" + name).getBytes( Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -61,7 +61,6 @@ import org.apache.qpid.server.configurat import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.exchange.DefaultDestination; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.messages.MessageStoreMessages; import org.apache.qpid.server.logging.messages.VirtualHostMessages; @@ -77,7 +76,6 @@ import org.apache.qpid.server.plugin.Qpi import org.apache.qpid.server.plugin.SystemNodeCreator; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.LinkRegistry; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.stats.StatisticsCounter; @@ -102,7 +100,7 @@ import org.apache.qpid.server.util.Conne import org.apache.qpid.server.util.MapValueConverter; public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> extends AbstractConfiguredObject<X> - implements VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, EventListener + implements VirtualHost<X>, EventListener { private final Collection<ConnectionValidator> _connectionValidators = new ArrayList<>(); @@ -265,7 +263,7 @@ public abstract class AbstractVirtualHos protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes) { super.validateChange(proxyForValidation, changedAttributes); - VirtualHost<?, ?, ?> virtualHost = (VirtualHost<?, ?, ?>) proxyForValidation; + VirtualHost<?> virtualHost = (VirtualHost<?>) proxyForValidation; if(changedAttributes.contains(GLOBAL_ADDRESS_DOMAINS)) { @@ -307,7 +305,7 @@ public abstract class AbstractVirtualHos validateMessageStoreCreation(); } - private void validateConnectionThreadPoolSettings(VirtualHost<?,?,?> virtualHost) + private void validateConnectionThreadPoolSettings(VirtualHost<?> virtualHost) { if (virtualHost.getConnectionThreadPoolSize() < 1) { @@ -443,12 +441,12 @@ public abstract class AbstractVirtualHos attributes.put(Exchange.NAME, name); attributes.put(Exchange.TYPE, type); attributes.put(Exchange.ID, UUIDGenerator.generateExchangeUUID(name, getName())); - final ListenableFuture<ExchangeImpl> future = addExchangeAsync(attributes); + final ListenableFuture<Exchange<?>> future = addExchangeAsync(attributes); final SettableFuture<Void> returnVal = SettableFuture.create(); - Futures.addCallback(future, new FutureCallback<ExchangeImpl>() + Futures.addCallback(future, new FutureCallback<Exchange<?>>() { @Override - public void onSuccess(final ExchangeImpl result) + public void onSuccess(final Exchange<?> result) { try { @@ -643,31 +641,6 @@ public abstract class AbstractVirtualHos }); } - public long getHouseKeepingTaskCount() - { - return _houseKeepingTaskExecutor.getTaskCount(); - } - - public long getHouseKeepingCompletedTaskCount() - { - return _houseKeepingTaskExecutor.getCompletedTaskCount(); - } - - public int getHouseKeepingPoolSize() - { - return _houseKeepingTaskExecutor.getCorePoolSize(); - } - - public void setHouseKeepingPoolSize(int newSize) - { - _houseKeepingTaskExecutor.setCorePoolSize(newSize); - } - - - public int getHouseKeepingActiveCount() - { - return _houseKeepingTaskExecutor.getActiveCount(); - } @Override public List<String> getEnabledConnectionValidators() @@ -688,9 +661,9 @@ public abstract class AbstractVirtualHos } @Override - public AMQQueue<?> getAttainedQueue(String name) + public Queue<?> getAttainedQueue(String name) { - Queue child = awaitChildClassToAttainState(Queue.class, name); + Queue<?> child = awaitChildClassToAttainState(Queue.class, name); if(child == null && getGlobalAddressDomains() != null) { for(String domain : getGlobalAddressDomains()) @@ -705,7 +678,7 @@ public abstract class AbstractVirtualHos } } } - return (AMQQueue<?>) child; + return child; } @Override @@ -716,9 +689,9 @@ public abstract class AbstractVirtualHos } @Override - public AMQQueue<?> getAttainedQueue(UUID id) + public Queue<?> getAttainedQueue(UUID id) { - return (AMQQueue<?>) awaitChildClassToAttainState(Queue.class, id); + return (Queue<?>) awaitChildClassToAttainState(Queue.class, id); } @Override @@ -728,30 +701,30 @@ public abstract class AbstractVirtualHos } @Override - public Collection<AMQQueue<?>> getQueues() + public Collection<Queue<?>> getQueues() { Collection children = getChildren(Queue.class); return children; } @Override - public int removeQueue(AMQQueue<?> queue) + public int removeQueue(Queue<?> queue) { return doSync(removeQueueAsync(queue)); } @Override - public ListenableFuture<Integer> removeQueueAsync(final AMQQueue<?> queue) + public ListenableFuture<Integer> removeQueueAsync(final Queue<?> queue) { return queue.deleteAndReturnCount(); } - public AMQQueue<?> createQueue(Map<String, Object> attributes) throws QueueExistsException + public Queue<?> createQueue(Map<String, Object> attributes) throws QueueExistsException { - return (AMQQueue<?> )createChild(Queue.class, attributes); + return (Queue<?> )createChild(Queue.class, attributes); } - private ListenableFuture<? extends AMQQueue<?>> addQueueAsync(Map<String, Object> attributes) throws QueueExistsException + private ListenableFuture<? extends Queue<?>> addQueueAsync(Map<String, Object> attributes) throws QueueExistsException { if (shouldCreateDLQ(attributes)) { @@ -765,16 +738,16 @@ public abstract class AbstractVirtualHos return Futures.immediateFuture(addQueueWithoutDLQ(attributes)); } - private AMQQueue<?> addQueueWithoutDLQ(Map<String, Object> attributes) throws QueueExistsException + private Queue<?> addQueueWithoutDLQ(Map<String, Object> attributes) throws QueueExistsException { try { - return (AMQQueue) getObjectFactory().create(Queue.class, attributes, this); + return (Queue) getObjectFactory().create(Queue.class, attributes, this); } catch (DuplicateNameException e) { throw new QueueExistsException(String.format("Queue with name '%s' already exists", e.getName()), - (AMQQueue) e.getExisting()); + (Queue<?>) e.getExisting()); } } @@ -788,9 +761,9 @@ public abstract class AbstractVirtualHos } @Override - public ExchangeImpl getAttainedExchange(String name) + public Exchange<?> getAttainedExchange(String name) { - Exchange child = awaitChildClassToAttainState(Exchange.class, name); + Exchange<?> child = awaitChildClassToAttainState(Exchange.class, name); if(child == null && getGlobalAddressDomains() != null) { for(String domain : getGlobalAddressDomains()) @@ -805,7 +778,7 @@ public abstract class AbstractVirtualHos } } } - return (ExchangeImpl) child; + return child; } private <C extends ConfiguredObject> C awaitChildClassToAttainState(final Class<C> childClass, final String name) @@ -843,7 +816,7 @@ public abstract class AbstractVirtualHos } @Override - public Collection<ExchangeImpl<?>> getExchanges() + public Collection<Exchange<?>> getExchanges() { Collection children = getChildren(Exchange.class); return children; @@ -851,26 +824,26 @@ public abstract class AbstractVirtualHos @Override - public ExchangeImpl createExchange(Map<String,Object> attributes) + public Exchange<?> createExchange(Map<String,Object> attributes) throws ExchangeExistsException, ReservedExchangeNameException, NoFactoryForTypeException { - return (ExchangeImpl)createChild(Exchange.class, attributes); + return (Exchange<?>) createChild(Exchange.class, attributes); } - private ListenableFuture<ExchangeImpl> addExchangeAsync(Map<String,Object> attributes) + private ListenableFuture<Exchange<?>> addExchangeAsync(Map<String,Object> attributes) throws ExchangeExistsException, ReservedExchangeNameException, NoFactoryForTypeException { - final SettableFuture<ExchangeImpl> returnVal = SettableFuture.create(); + final SettableFuture<Exchange<?>> returnVal = SettableFuture.create(); Futures.addCallback(getObjectFactory().createAsync(Exchange.class, attributes, this), new FutureCallback<Exchange>() { @Override public void onSuccess(final Exchange result) { - returnVal.set((ExchangeImpl) result); + returnVal.set(result); } @Override @@ -879,7 +852,7 @@ public abstract class AbstractVirtualHos if(t instanceof DuplicateNameException) { DuplicateNameException dne = (DuplicateNameException) t; - returnVal.setException(new ExchangeExistsException((ExchangeImpl) dne.getExisting())); + returnVal.setException(new ExchangeExistsException((Exchange<?>) dne.getExisting())); } else { @@ -1217,7 +1190,7 @@ public abstract class AbstractVirtualHos Broker<?> broker = virtualHostNode.getParent(Broker.class); broker.assignTargetSizes(); - for (AMQQueue<?> q : getQueues()) + for (Queue<?> q : getQueues()) { if (q.getState() == State.ACTIVE) { @@ -1276,7 +1249,7 @@ public abstract class AbstractVirtualHos } @Override - public VirtualHostImpl getVirtualHost() + public VirtualHost<?> getVirtualHost() { return AbstractVirtualHost.this; } @@ -1290,13 +1263,6 @@ public abstract class AbstractVirtualHos } - @Override - public boolean getDefaultDeadLetterQueueEnabled() - { - return isQueue_deadLetterQueueEnabled(); - } - - public void executeTransaction(TransactionalOperation op) { final MessageStore store = getMessageStore(); @@ -1333,16 +1299,15 @@ public abstract class AbstractVirtualHos } } - public void copy(QueueEntry entry, Queue queue) + public void copy(QueueEntry entry, final Queue<?> queue) { final ServerMessage message = entry.getMessage(); - final AMQQueue toQueue = (AMQQueue)queue; - txn.enqueue(toQueue, message, new ServerTransaction.EnqueueAction() + txn.enqueue(queue, message, new ServerTransaction.EnqueueAction() { public void postCommit(MessageEnqueueRecord... records) { - toQueue.enqueue(message, null, records[0]); + queue.enqueue(message, null, records[0]); } public void onRollback() @@ -1352,19 +1317,18 @@ public abstract class AbstractVirtualHos } - public void move(final QueueEntry entry, Queue queue) + public void move(final QueueEntry entry, final Queue<?> queue) { final ServerMessage message = entry.getMessage(); - final AMQQueue toQueue = (AMQQueue)queue; if(entry.acquire()) { - txn.enqueue(toQueue, message, + txn.enqueue(queue, message, new ServerTransaction.EnqueueAction() { public void postCommit(MessageEnqueueRecord... records) { - toQueue.enqueue(message, null, records[0]); + queue.enqueue(message, null, records[0]); } public void onRollback() @@ -1561,7 +1525,7 @@ public abstract class AbstractVirtualHos final String dlExchangeName = getDeadLetterExchangeName(queueName); final String dlQueueName = getDeadLetterQueueName(queueName); - ExchangeImpl dlExchange = null; + Exchange<?> dlExchange = null; final UUID dlExchangeId = UUID.randomUUID(); try @@ -1587,10 +1551,10 @@ public abstract class AbstractVirtualHos throw new ConnectionScopedRuntimeException("Attempt to create an alternate exchange for a queue failed",e); } - AMQQueue dlQueue = null; + Queue<?> dlQueue = null; { - dlQueue = (AMQQueue) getChildByName(Queue.class, dlQueueName); + dlQueue = (Queue<?>) getChildByName(Queue.class, dlQueueName); if(dlQueue == null) { @@ -1680,7 +1644,7 @@ public abstract class AbstractVirtualHos private static String getDeadLetterExchangeName(String name) { - return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, VirtualHostImpl.DEFAULT_DLE_NAME_SUFFIX); + return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, VirtualHost.DEFAULT_DLE_NAME_SUFFIX); } @Override @@ -1710,12 +1674,12 @@ public abstract class AbstractVirtualHos private void allocateTargetSizeToQueues() { long targetSize = _targetSize.get(); - Collection<AMQQueue<?>> queues = getQueues(); + Collection<Queue<?>> queues = getQueues(); long totalSize = calculateTotalEnqueuedSize(queues); _logger.debug("Allocating target size to queues, total target: {} ; total enqueued size {}", targetSize, totalSize); if(targetSize > 0l) { - for (AMQQueue<?> q : queues) + for (Queue<?> q : queues) { long size = (long) ((((double) q.getPotentialMemoryFootprint() / (double) totalSize)) * (double) targetSize); @@ -1832,10 +1796,10 @@ public abstract class AbstractVirtualHos } - private long calculateTotalEnqueuedSize(final Collection<AMQQueue<?>> queues) + private long calculateTotalEnqueuedSize(final Collection<Queue<?>> queues) { long total = 0; - for(AMQQueue<?> queue : queues) + for(Queue<?> queue : queues) { total += queue.getPotentialMemoryFootprint(); } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java Fri Dec 11 15:50:19 2015 @@ -43,8 +43,9 @@ import org.apache.qpid.server.logging.me import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; 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.plugin.MessageMetaDataType; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.store.MessageEnqueueRecord; import org.apache.qpid.server.store.MessageStore; @@ -67,7 +68,7 @@ public class AsynchronousMessageStoreRec private AsynchronousRecoverer _asynchronousRecoverer; @Override - public ListenableFuture<Void> recover(final VirtualHostImpl virtualHost) + public ListenableFuture<Void> recover(final VirtualHost<?> virtualHost) { _asynchronousRecoverer = new AsynchronousRecoverer(virtualHost); @@ -88,19 +89,19 @@ public class AsynchronousMessageStoreRec private static final Logger LOGGER = LoggerFactory.getLogger(AsynchronousRecoverer.class); public static final int THREAD_POOL_SHUTDOWN_TIMEOUT = 5000; - private final VirtualHostImpl<?, ?, ?> _virtualHost; + private final VirtualHost<?> _virtualHost; private final EventLogger _eventLogger; private final MessageStore _store; private final MessageStoreLogSubject _logSubject; private final long _maxMessageId; - private final Set<AMQQueue<?>> _recoveringQueues = new CopyOnWriteArraySet<>(); + private final Set<Queue<?>> _recoveringQueues = new CopyOnWriteArraySet<>(); private final AtomicBoolean _recoveryComplete = new AtomicBoolean(); private final Map<Long, MessageReference<? extends ServerMessage<?>>> _recoveredMessages = new HashMap<>(); private final ListeningExecutorService _queueRecoveryExecutor = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool()); private final MessageStore.MessageStoreReader _storeReader; private AtomicBoolean _continueRecovery = new AtomicBoolean(true); - private AsynchronousRecoverer(final VirtualHostImpl<?, ?, ?> virtualHost) + private AsynchronousRecoverer(final VirtualHost<?> virtualHost) { _virtualHost = virtualHost; _eventLogger = virtualHost.getEventLogger(); @@ -118,7 +119,7 @@ public class AsynchronousMessageStoreRec getStoreReader().visitDistributedTransactions(new DistributedTransactionVisitor()); List<ListenableFuture<Void>> queueRecoveryFutures = new ArrayList<>(); - for(AMQQueue<?> queue : _recoveringQueues) + for(Queue<?> queue : _recoveringQueues) { ListenableFuture<Void> result = _queueRecoveryExecutor.submit(new QueueRecoveringTask(queue), null); queueRecoveryFutures.add(result); @@ -134,7 +135,7 @@ public class AsynchronousMessageStoreRec }); } - public VirtualHostImpl<?, ?, ?> getVirtualHost() + public VirtualHost<?> getVirtualHost() { return _virtualHost; } @@ -154,12 +155,12 @@ public class AsynchronousMessageStoreRec return _logSubject; } - private boolean isRecovering(AMQQueue<?> queue) + private boolean isRecovering(Queue<?> queue) { return _recoveringQueues.contains(queue); } - private void recoverQueue(AMQQueue<?> queue) + private void recoverQueue(Queue<?> queue) { MessageInstanceVisitor handler = new MessageInstanceVisitor(queue); _storeReader.visitMessageInstances(queue, handler); @@ -277,7 +278,7 @@ public class AsynchronousMessageStoreRec } for (Transaction.EnqueueRecord record : enqueues) { - final AMQQueue<?> queue = getVirtualHost().getAttainedQueue(record.getResource().getId()); + final Queue<?> queue = getVirtualHost().getAttainedQueue(record.getResource().getId()); if (queue != null) { final long messageId = record.getMessage().getMessageNumber(); @@ -337,7 +338,7 @@ public class AsynchronousMessageStoreRec for (Transaction.DequeueRecord record : dequeues) { - final AMQQueue<?> queue = getVirtualHost().getAttainedQueue(record.getEnqueueRecord().getQueueId()); + final Queue<?> queue = getVirtualHost().getAttainedQueue(record.getEnqueueRecord().getQueueId()); if (queue != null) { @@ -420,9 +421,9 @@ public class AsynchronousMessageStoreRec private class QueueRecoveringTask implements Runnable { - private final AMQQueue<?> _queue; + private final Queue<?> _queue; - public QueueRecoveringTask(final AMQQueue<?> queue) + public QueueRecoveringTask(final Queue<?> queue) { _queue = queue; } @@ -447,10 +448,10 @@ public class AsynchronousMessageStoreRec private class MessageInstanceVisitor implements MessageInstanceHandler { - private final AMQQueue<?> _queue; + private final Queue<?> _queue; long _recoveredCount; - private MessageInstanceVisitor(AMQQueue<?> queue) + private MessageInstanceVisitor(Queue<?> queue) { _queue = queue; } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java Fri Dec 11 15:50:19 2015 @@ -21,25 +21,25 @@ package org.apache.qpid.server.virtualhost; -import org.apache.qpid.server.exchange.ExchangeImpl; +import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.IntegrityViolationException; public class ExchangeExistsException extends IntegrityViolationException { - private final ExchangeImpl _existing; + private final Exchange<?> _existing; - public ExchangeExistsException(ExchangeImpl existing) + public ExchangeExistsException(Exchange<?> existing) { this(existing.getName(), existing); } - public ExchangeExistsException(String message, ExchangeImpl existing) + public ExchangeExistsException(String message, Exchange<?> existing) { super(message); _existing = existing; } - public ExchangeImpl getExistingExchange() + public Exchange<?> getExistingExchange() { return _existing; } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java Fri Dec 11 15:50:19 2015 @@ -22,9 +22,11 @@ package org.apache.qpid.server.virtualho import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.model.VirtualHost; + public interface MessageStoreRecoverer { - ListenableFuture<Void> recover(VirtualHostImpl virtualHost); + ListenableFuture<Void> recover(VirtualHost<?> virtualHost); /** * Cancels any in-progress message store recovery. If message store recovery has already Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/NonStandardVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/NonStandardVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/NonStandardVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/NonStandardVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -20,10 +20,8 @@ */ package org.apache.qpid.server.virtualhost; -import org.apache.qpid.server.model.Exchange; -import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.VirtualHost; -public interface NonStandardVirtualHost<X extends NonStandardVirtualHost<X, Q, E>, Q extends Queue<?>, E extends Exchange<?> > extends VirtualHost<X, Q, E> +public interface NonStandardVirtualHost<X extends NonStandardVirtualHost<X>> extends VirtualHost<X> { } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -19,15 +19,14 @@ package org.apache.qpid.server.virtualhost; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.ManagedAttribute; -import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.SizeMonitoringSettings; public interface ProvidedStoreVirtualHost<X extends ProvidedStoreVirtualHost<X>> - extends VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>, + extends VirtualHost<X>, SizeMonitoringSettings, - NonStandardVirtualHost<X,AMQQueue<?>,ExchangeImpl<?>> + NonStandardVirtualHost<X> { @ManagedAttribute(mandatory = true, defaultValue = "0") Long getStoreUnderfullSize(); Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java Fri Dec 11 15:50:19 2015 @@ -21,24 +21,24 @@ package org.apache.qpid.server.virtualhost; import org.apache.qpid.server.model.IntegrityViolationException; -import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.model.Queue; public class QueueExistsException extends IntegrityViolationException { - private final AMQQueue _existing; + private final Queue<?> _existing; - public QueueExistsException(AMQQueue existing) + public QueueExistsException(Queue<?> existing) { this(existing.getName(), existing); } - public QueueExistsException(String name, AMQQueue existing) + public QueueExistsException(String name, Queue<?> existing) { super(name); _existing = existing; } - public AMQQueue getExistingQueue() + public Queue<?> getExistingQueue() { return _existing; } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java Fri Dec 11 15:50:19 2015 @@ -37,8 +37,9 @@ import org.apache.qpid.server.logging.me import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; 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.plugin.MessageMetaDataType; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.store.MessageEnqueueRecord; import org.apache.qpid.server.store.MessageStore; @@ -61,7 +62,7 @@ public class SynchronousMessageStoreReco private static final Logger _logger = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class); @Override - public ListenableFuture<Void> recover(VirtualHostImpl virtualHost) + public ListenableFuture<Void> recover(VirtualHost<?> virtualHost) { EventLogger eventLogger = virtualHost.getEventLogger(); MessageStore store = virtualHost.getMessageStore(); @@ -87,9 +88,9 @@ public class SynchronousMessageStoreReco virtualHost.getAttainedQueue(entry.getKey()).completeRecovery(); } - Collection<AMQQueue> allQueues = virtualHost.getQueues(); + Collection<Queue<?>> allQueues = virtualHost.getQueues(); - for(AMQQueue q : allQueues) + for(Queue<?> q : allQueues) { if(!queueRecoveries.containsKey(q.getName())) { @@ -155,14 +156,14 @@ public class SynchronousMessageStoreReco private static class MessageInstanceVisitor implements MessageInstanceHandler { - private final VirtualHostImpl _virtualHost; + private final VirtualHost<?> _virtualHost; private final MessageStore _store; private final Map<String, Integer> _queueRecoveries; private final Map<Long, ServerMessage<?>> _recoveredMessages; private final Map<Long, StoredMessage<?>> _unusedMessages; - private MessageInstanceVisitor(final VirtualHostImpl virtualHost, + private MessageInstanceVisitor(final VirtualHost<?> virtualHost, final MessageStore store, final Map<String, Integer> queueRecoveries, final Map<Long, ServerMessage<?>> recoveredMessages, @@ -180,7 +181,7 @@ public class SynchronousMessageStoreReco { final UUID queueId = record.getQueueId(); long messageId = record.getMessageNumber(); - AMQQueue<?> queue = _virtualHost.getAttainedQueue(queueId); + Queue<?> queue = _virtualHost.getAttainedQueue(queueId); if(queue != null) { String queueName = queue.getName(); @@ -226,7 +227,7 @@ public class SynchronousMessageStoreReco private static class DistributedTransactionVisitor implements DistributedTransactionHandler { - private final VirtualHostImpl _virtualHost; + private final VirtualHost<?> _virtualHost; private final MessageStore _store; private final EventLogger _eventLogger; private final MessageStoreLogSubject _logSubject; @@ -234,7 +235,7 @@ public class SynchronousMessageStoreReco private final Map<Long, ServerMessage<?>> _recoveredMessages; private final Map<Long, StoredMessage<?>> _unusedMessages; - private DistributedTransactionVisitor(final VirtualHostImpl virtualHost, + private DistributedTransactionVisitor(final VirtualHost<?> virtualHost, final MessageStore store, final EventLogger eventLogger, final MessageStoreLogSubject logSubject, @@ -264,7 +265,7 @@ public class SynchronousMessageStoreReco } for(EnqueueRecord record : enqueues) { - final AMQQueue<?> queue = _virtualHost.getAttainedQueue(record.getResource().getId()); + final Queue<?> queue = _virtualHost.getAttainedQueue(record.getResource().getId()); if(queue != null) { final long messageId = record.getMessage().getMessageNumber(); @@ -320,7 +321,7 @@ public class SynchronousMessageStoreReco } for(Transaction.DequeueRecord record : dequeues) { - final AMQQueue<?> queue = _virtualHost.getAttainedQueue(record.getEnqueueRecord().getQueueId()); + final Queue<?> queue = _virtualHost.getAttainedQueue(record.getEnqueueRecord().getQueueId()); if(queue != null) { final long messageId = record.getEnqueueRecord().getMessageNumber(); Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java Fri Dec 11 15:50:19 2015 @@ -26,10 +26,10 @@ import org.apache.qpid.server.model.Virt public class VirtualHostPrincipal implements Principal { - private final VirtualHost<?,?,?> _virtualHost; + private final VirtualHost<?> _virtualHost; private final String _name; - public VirtualHostPrincipal(VirtualHost<?, ?, ?> virtualHost) + public VirtualHostPrincipal(VirtualHost<?> virtualHost) { _virtualHost = virtualHost; _name = "virtualhost:" + virtualHost.getName() + "-" + virtualHost.getId(); Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPropertiesNode.java Fri Dec 11 15:50:19 2015 @@ -37,11 +37,11 @@ import org.apache.qpid.server.model.Virt public class VirtualHostPropertiesNode extends AbstractSystemMessageSource { - public VirtualHostPropertiesNode(final VirtualHost<?, ?, ?> virtualHost) + public VirtualHostPropertiesNode(final VirtualHost<?> virtualHost) { this(virtualHost, "$virtualhostProperties"); } - public VirtualHostPropertiesNode(final VirtualHost<?, ?, ?> virtualHost, String name) + public VirtualHostPropertiesNode(final VirtualHost<?> virtualHost, String name) { super(name, virtualHost); } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostUnavailableException.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostUnavailableException.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostUnavailableException.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostUnavailableException.java Fri Dec 11 15:50:19 2015 @@ -20,11 +20,12 @@ */ package org.apache.qpid.server.virtualhost; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; public class VirtualHostUnavailableException extends ConnectionScopedRuntimeException { - public VirtualHostUnavailableException(VirtualHostImpl<?, ?, ?> host) + public VirtualHostUnavailableException(VirtualHost<?> host) { super("Virtualhost state " + host.getState() Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java Fri Dec 11 15:50:19 2015 @@ -45,7 +45,7 @@ public final class VirtualHostNameAliasI Broker<?> broker = getPort().getParent(Broker.class); for(VirtualHostNode<?> vhn : broker.getVirtualHostNodes()) { - VirtualHost<?, ?, ?> vh = vhn.getVirtualHost(); + VirtualHost<?> vh = vhn.getVirtualHost(); if(vh != null && vh.getName().equals(name)) { return vhn; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java Fri Dec 11 15:50:19 2015 @@ -105,11 +105,11 @@ public abstract class AbstractStandardVi getEventLogger().message(getConfigurationStoreLogSubject(), ConfigStoreMessages.RECOVERY_COMPLETE()); - VirtualHost<?,?,?> host = getVirtualHost(); + VirtualHost<?> host = getVirtualHost(); if (host != null) { - final VirtualHost<?,?,?> recoveredHost = host; + final VirtualHost<?> recoveredHost = host; final ListenableFuture<Void> openFuture = Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<ListenableFuture<Void>>() { Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Fri Dec 11 15:50:19 2015 @@ -111,7 +111,7 @@ public abstract class AbstractVirtualHos @Override public Principal getPrincipal() { - VirtualHost<?,?,?> virtualHost = getVirtualHost(); + VirtualHost<?> virtualHost = getVirtualHost(); if (virtualHost != null) { return virtualHost.getPrincipal(); @@ -208,7 +208,7 @@ public abstract class AbstractVirtualHos } @Override - public VirtualHost<?,?,?> getVirtualHost() + public VirtualHost<?> getVirtualHost() { Collection<VirtualHost> children = new ArrayList<>(getChildren(VirtualHost.class)); if (children.size() == 0) @@ -347,7 +347,7 @@ public abstract class AbstractVirtualHos protected ListenableFuture<Void> deleteVirtualHostIfExists() { - VirtualHost<?, ?, ?> virtualHost = getVirtualHost(); + VirtualHost<?> virtualHost = getVirtualHost(); if (virtualHost != null) { return virtualHost.deleteAsync(); Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHost.java Fri Dec 11 15:50:19 2015 @@ -20,13 +20,11 @@ */ package org.apache.qpid.server.virtualhostnode; -import org.apache.qpid.server.exchange.ExchangeImpl; -import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.virtualhost.NonStandardVirtualHost; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; public interface RedirectingVirtualHost<X extends RedirectingVirtualHost<X>> - extends VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, - NonStandardVirtualHost<X,AMQQueue<?>,ExchangeImpl<?>> + extends VirtualHost<X>, + NonStandardVirtualHost<X> { } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java Fri Dec 11 15:50:19 2015 @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFut import com.google.common.util.concurrent.ListenableFuture; -import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.message.MessageSource; @@ -45,12 +44,12 @@ import org.apache.qpid.server.model.Exch import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; +import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHostAlias; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.protocol.LinkRegistry; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.store.DurableConfigurationStore; @@ -154,7 +153,7 @@ class RedirectingVirtualHostImpl } @Override - public ExchangeImpl createExchange(final Map<String, Object> attributes) + public Exchange<?> createExchange(final Map<String, Object> attributes) { throwUnsupportedForRedirector(); return null; @@ -167,13 +166,13 @@ class RedirectingVirtualHostImpl } @Override - public ExchangeImpl<?> getAttainedExchange(final String name) + public Exchange<?> getAttainedExchange(final String name) { return null; } @Override - public AMQQueue<?> createQueue(final Map<String, Object> attributes) + public Queue<?> createQueue(final Map<String, Object> attributes) { throwUnsupportedForRedirector(); return null; @@ -312,7 +311,7 @@ class RedirectingVirtualHostImpl } @Override - public AMQQueue<?> getAttainedQueue(final String name) + public Queue<?> getAttainedQueue(final String name) { return null; } @@ -324,34 +323,34 @@ class RedirectingVirtualHostImpl } @Override - public AMQQueue<?> getAttainedQueue(final UUID id) + public Queue<?> getAttainedQueue(final UUID id) { return null; } @Override - public Collection<AMQQueue<?>> getQueues() + public Collection<Queue<?>> getQueues() { return Collections.emptyList(); } @Override - public ListenableFuture<Integer> removeQueueAsync(final AMQQueue<?> queue) + public ListenableFuture<Integer> removeQueueAsync(final Queue<?> queue) { throwUnsupportedForRedirector(); return null; } @Override - public int removeQueue(final AMQQueue<?> queue) + public int removeQueue(final Queue<?> queue) { throwUnsupportedForRedirector(); return 0; } @Override - public Collection<ExchangeImpl<?>> getExchanges() + public Collection<Exchange<?>> getExchanges() { return Collections.emptyList(); } @@ -404,35 +403,6 @@ class RedirectingVirtualHostImpl } @Override - public long getHouseKeepingTaskCount() - { - return 0; - } - - @Override - public long getHouseKeepingCompletedTaskCount() - { - return 0; - } - - @Override - public int getHouseKeepingPoolSize() - { - return 0; - } - - @Override - public void setHouseKeepingPoolSize(final int newSize) - { - } - - @Override - public int getHouseKeepingActiveCount() - { - return 0; - } - - @Override public DtxRegistry getDtxRegistry() { return null; @@ -452,12 +422,6 @@ class RedirectingVirtualHostImpl } @Override - public boolean getDefaultDeadLetterQueueEnabled() - { - return false; - } - - @Override public EventLogger getEventLogger() { return null; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java Fri Dec 11 15:50:19 2015 @@ -109,7 +109,7 @@ public class RedirectingVirtualHostNodeI } @Override - public VirtualHost<?, ?, ?> getVirtualHost() + public VirtualHost<?> getVirtualHost() { return _virtualHost; } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java Fri Dec 11 15:50:19 2015 @@ -30,13 +30,13 @@ import org.apache.qpid.common.AMQPFilter import org.apache.qpid.server.configuration.IllegalConfigurationException; 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.model.Binding; import org.apache.qpid.server.model.BrokerModel; +import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Model; -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.security.SecurityManager; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; public class BindingImplTest extends QpidTestCase @@ -58,15 +58,15 @@ public class BindingImplTest extends Qpi Map<String,Object> attributes = new HashMap<>(); attributes.put(Binding.ARGUMENTS, arguments); attributes.put(Binding.NAME, getTestName()); - AMQQueue queue = mock(AMQQueue.class); - VirtualHostImpl vhost = mock(VirtualHostImpl.class); + Queue<?> queue = mock(Queue.class); + VirtualHost vhost = mock(VirtualHost.class); SecurityManager securityManager = mock(SecurityManager.class); when(vhost.getSecurityManager()).thenReturn(securityManager); when(queue.getTaskExecutor()).thenReturn(_taskExecutor); when(queue.getChildExecutor()).thenReturn(_taskExecutor); when(queue.getVirtualHost()).thenReturn(vhost); when(queue.getModel()).thenReturn(_model); - ExchangeImpl exchange = mock(ExchangeImpl.class); + Exchange<?> exchange = mock(Exchange.class); when(exchange.getTaskExecutor()).thenReturn(_taskExecutor); when(exchange.getChildExecutor()).thenReturn(_taskExecutor); when(exchange.getModel()).thenReturn(_model); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java Fri Dec 11 15:50:19 2015 @@ -91,7 +91,7 @@ public class VirtualHostCreationTest ext attributes.put(VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE); attributes.put(VirtualHost.ID, UUID.randomUUID()); - VirtualHost<?,?,?> host = new TestMemoryVirtualHost(attributes, _virtualHostNode); + VirtualHost<?> host = new TestMemoryVirtualHost(attributes, _virtualHostNode); host.open(); assertNotNull("Null is returned", host); @@ -118,7 +118,7 @@ public class VirtualHostCreationTest ext copy.put(ConfiguredObject.ID, UUID.randomUUID()); try { - VirtualHost<?,?,?> host = new TestMemoryVirtualHost(copy,_virtualHostNode); + VirtualHost<?> host = new TestMemoryVirtualHost(copy, _virtualHostNode); host.open(); fail("Cannot create a virtual host without a mandatory attribute " + name); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/StoreConfigurationChangeListenerTest.java Fri Dec 11 15:50:19 2015 @@ -97,7 +97,7 @@ public class StoreConfigurationChangeLis VirtualHostNode<?> object = mock(VirtualHostNode.class); when(object.managesChildStorage()).thenReturn(true); - VirtualHost<?,?,?> virtualHost = mock(VirtualHost.class); + VirtualHost<?> virtualHost = mock(VirtualHost.class); _listener.childAdded(object, virtualHost); verifyNoMoreInteractions(_store); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java Fri Dec 11 15:50:19 2015 @@ -24,49 +24,28 @@ package org.apache.qpid.server.consumer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.lang.reflect.Type; -import java.net.SocketAddress; -import java.security.AccessControlException; -import java.security.Principal; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.UUID; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.google.common.util.concurrent.ListenableFuture; - import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutor; -import org.apache.qpid.server.filter.FilterManager; -import org.apache.qpid.server.filter.Filterable; -import org.apache.qpid.server.filter.MessageFilter; import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.message.MessageInstance; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.BrokerModel; -import org.apache.qpid.server.model.ConfigurationChangeListener; -import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectFactory; import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.Consumer; -import org.apache.qpid.server.model.LifetimePolicy; -import org.apache.qpid.server.model.Model; +import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.Session; -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.protocol.ConsumerListener; -import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.transport.AMQPConnection; -import org.apache.qpid.server.transport.AbstractAMQPConnection; -import org.apache.qpid.server.queue.AMQQueue; -import org.apache.qpid.server.transport.NetworkConnectionScheduler; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.StateChangeListener; import org.apache.qpid.transport.network.Ticker; @@ -77,7 +56,7 @@ public class MockConsumer implements Con private final List<String> _messageIds; private boolean _closed = false; private String tag = "mocktag"; - private AMQQueue queue = null; + private Queue<?> queue = null; private StateChangeListener<ConsumerTarget, State> _listener = null; private State _state = State.ACTIVE; private ArrayList<MessageInstance> messages = new ArrayList<MessageInstance>(); @@ -121,7 +100,7 @@ public class MockConsumer implements Con return 0; } - public AMQQueue getQueue() + public Queue<?> getQueue() { return queue; } @@ -341,12 +320,12 @@ public class MockConsumer implements Con } @Override - public void block(AMQQueue queue) + public void block(Queue<?> queue) { } @Override - public void unblock(AMQQueue queue) + public void unblock(Queue<?> queue) { } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java Fri Dec 11 15:50:19 2015 @@ -21,23 +21,21 @@ package org.apache.qpid.server.exchange; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; -import com.google.common.util.concurrent.ListenableFuture; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.State; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException; import org.apache.qpid.server.virtualhost.ReservedExchangeNameException; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; public class DirectExchangeTest extends QpidTestCase { private DirectExchange _exchange; - private VirtualHostImpl _vhost; + private VirtualHost<?> _vhost; @Override public void setUp() throws Exception Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Fri Dec 11 15:50:19 2015 @@ -48,15 +48,13 @@ import org.apache.qpid.server.message.Se import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; -import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.security.SecurityManager; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class FanoutExchangeTest extends QpidTestCase { private FanoutExchange _exchange; - private VirtualHostImpl _virtualHost; + private VirtualHost _virtualHost; private TaskExecutor _taskExecutor; public void setUp() @@ -79,7 +77,7 @@ public class FanoutExchangeTest extends _taskExecutor = new CurrentThreadTaskExecutor(); _taskExecutor.start(); - _virtualHost = mock(VirtualHostImpl.class); + _virtualHost = mock(VirtualHost.class); when(_virtualHost.getSecurityManager()).thenReturn(securityManager); when(_virtualHost.getEventLogger()).thenReturn(new EventLogger()); @@ -100,53 +98,53 @@ public class FanoutExchangeTest extends public void testIsBoundStringMapAMQQueueWhenQueueIsNull() { - assertFalse("calling isBound(AMQShortString,FieldTable,AMQQueue) with null queue should return false", - _exchange.isBound((String) null, (Map) null, (AMQQueue) null)); + assertFalse("calling isBound(AMQShortString,FieldTable,Queue<?>) with null queue should return false", + _exchange.isBound((String) null, (Map) null, (Queue<?>) null)); } public void testIsBoundStringAMQQueueWhenQueueIsNull() { - assertFalse("calling isBound(AMQShortString,AMQQueue) with null queue should return false", - _exchange.isBound((String) null, (AMQQueue) null)); + assertFalse("calling isBound(AMQShortString,Queue<?>) with null queue should return false", + _exchange.isBound((String) null, (Queue<?>) null)); } public void testIsBoundAMQQueueWhenQueueIsNull() { - assertFalse("calling isBound(AMQQueue) with null queue should return false", _exchange.isBound((AMQQueue) null)); + assertFalse("calling isBound(AMQQueue) with null queue should return false", _exchange.isBound((Queue<?>) null)); } public void testIsBoundStringMapAMQQueue() { - AMQQueue queue = bindQueue(); + Queue<?> queue = bindQueue(); assertTrue("Should return true for a bound queue", _exchange.isBound("matters", null, queue)); } public void testIsBoundStringAMQQueue() { - AMQQueue queue = bindQueue(); + Queue<?> queue = bindQueue(); assertTrue("Should return true for a bound queue", _exchange.isBound("matters", queue)); } public void testIsBoundAMQQueue() { - AMQQueue queue = bindQueue(); + Queue<?> queue = bindQueue(); assertTrue("Should return true for a bound queue", _exchange.isBound(queue)); } - private AMQQueue bindQueue() + private Queue<?> bindQueue() { - AMQQueue queue = mockQueue(); + Queue<?> queue = mockQueue(); _exchange.addBinding("matters", queue, null); return queue; } - private AMQQueue mockQueue() + private Queue<?> mockQueue() { - AMQQueue queue = mock(AMQQueue.class); + Queue queue = mock(Queue.class); when(queue.getVirtualHost()).thenReturn(_virtualHost); when(queue.getCategoryClass()).thenReturn(Queue.class); when(queue.getModel()).thenReturn(BrokerModel.getInstance()); @@ -159,8 +157,8 @@ public class FanoutExchangeTest extends public void testRoutingWithSelectors() throws Exception { - AMQQueue queue1 = mockQueue(); - AMQQueue queue2 = mockQueue(); + Queue<?> queue1 = mockQueue(); + Queue<?> queue2 = mockQueue(); _exchange.addBinding("key",queue1, null); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java Fri Dec 11 15:50:19 2015 @@ -37,8 +37,9 @@ import org.apache.qpid.server.logging.Ev import org.apache.qpid.server.message.AMQMessageHeader; import org.apache.qpid.server.model.Binding; import org.apache.qpid.server.model.BrokerModel; -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.Queue; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.test.utils.QpidTestCase; /** @@ -142,16 +143,16 @@ public class HeadersBindingTest extends private Map<String,Object> bindHeaders = new HashMap<String,Object>(); private MockHeader matchHeaders = new MockHeader(); private int _count = 0; - private AMQQueue _queue; - private ExchangeImpl _exchange; + private Queue<?> _queue; + private Exchange<?> _exchange; protected void setUp() { _count++; - _queue = mock(AMQQueue.class); + _queue = mock(Queue.class); TaskExecutor executor = new CurrentThreadTaskExecutor(); executor.start(); - VirtualHostImpl vhost = mock(VirtualHostImpl.class); + VirtualHost vhost = mock(VirtualHost.class); when(_queue.getVirtualHost()).thenReturn(vhost); when(_queue.getModel()).thenReturn(BrokerModel.getInstance()); when(_queue.getTaskExecutor()).thenReturn(executor); @@ -163,7 +164,7 @@ public class HeadersBindingTest extends when(vhost.getTaskExecutor()).thenReturn(executor); when(vhost.getChildExecutor()).thenReturn(executor); - _exchange = mock(ExchangeImpl.class); + _exchange = mock(Exchange.class); when(_exchange.getType()).thenReturn(ExchangeDefaults.HEADERS_EXCHANGE_CLASS); when(_exchange.getEventLogger()).thenReturn(eventLogger); when(_exchange.getModel()).thenReturn(BrokerModel.getInstance()); @@ -366,8 +367,8 @@ public class HeadersBindingTest extends public 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/exchange/HeadersExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Fri Dec 11 15:50:19 2015 @@ -52,15 +52,13 @@ import org.apache.qpid.server.model.Conf 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.queue.AMQQueue; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.security.SecurityManager; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; public class HeadersExchangeTest extends QpidTestCase { private HeadersExchange _exchange; - private VirtualHostImpl _virtualHost; + private VirtualHost _virtualHost; private TaskExecutor _taskExecutor; private ConfiguredObjectFactoryImpl _factory; @@ -71,7 +69,7 @@ public class HeadersExchangeTest extends _taskExecutor = new CurrentThreadTaskExecutor(); _taskExecutor.start(); - _virtualHost = mock(VirtualHostImpl.class); + _virtualHost = mock(VirtualHost.class); Broker broker = mock(Broker.class); SecurityManager securityManager = new SecurityManager(broker, false); @@ -109,7 +107,7 @@ public class HeadersExchangeTest extends _taskExecutor.stop(); } - protected void routeAndTest(ServerMessage msg, AMQQueue... expected) throws Exception + protected void routeAndTest(ServerMessage msg, Queue<?>... expected) throws Exception { List<? extends BaseQueue> results = _exchange.route(msg, "", InstanceProperties.EMPTY); List<? extends BaseQueue> unexpected = new ArrayList<BaseQueue>(results); @@ -122,7 +120,7 @@ public class HeadersExchangeTest extends } - private AMQQueue createAndBind(final String name, String... arguments) + private Queue<?> createAndBind(final String name, String... arguments) throws Exception { return createAndBind(name, getArgsMapFromStrings(arguments)); @@ -147,22 +145,22 @@ public class HeadersExchangeTest extends return map; } - private AMQQueue createAndBind(final String name, Map<String, Object> arguments) + private Queue<?> createAndBind(final String name, Map<String, Object> arguments) throws Exception { - AMQQueue q = create(name); + Queue<?> q = create(name); bind(name, arguments, q); return q; } - private void bind(String bindingKey, Map<String, Object> arguments, AMQQueue q) + private void bind(String bindingKey, Map<String, Object> arguments, Queue<?> q) { _exchange.addBinding(bindingKey,q,arguments); } - private AMQQueue create(String name) + private Queue<?> create(String name) { - AMQQueue q = mock(AMQQueue.class); + Queue q = mock(Queue.class); when(q.toString()).thenReturn(name); when(q.getVirtualHost()).thenReturn(_virtualHost); when(q.getParent(VirtualHost.class)).thenReturn(_virtualHost); @@ -178,14 +176,14 @@ public class HeadersExchangeTest extends public void testSimple() throws Exception { - AMQQueue q1 = createAndBind("Q1", "F0000"); - AMQQueue q2 = createAndBind("Q2", "F0000=Aardvark"); - AMQQueue q3 = createAndBind("Q3", "F0001"); - AMQQueue q4 = createAndBind("Q4", "F0001=Bear"); - AMQQueue q5 = createAndBind("Q5", "F0000", "F0001"); - AMQQueue q6 = createAndBind("Q6", "F0000=Aardvark", "F0001=Bear"); - AMQQueue q7 = createAndBind("Q7", "F0000", "F0001=Bear"); - AMQQueue q8 = createAndBind("Q8", "F0000=Aardvark", "F0001"); + Queue<?> q1 = createAndBind("Q1", "F0000"); + Queue<?> q2 = createAndBind("Q2", "F0000=Aardvark"); + Queue<?> q3 = createAndBind("Q3", "F0001"); + Queue<?> q4 = createAndBind("Q4", "F0001=Bear"); + Queue<?> q5 = createAndBind("Q5", "F0000", "F0001"); + Queue<?> q6 = createAndBind("Q6", "F0000=Aardvark", "F0001=Bear"); + Queue<?> q7 = createAndBind("Q7", "F0000", "F0001=Bear"); + Queue<?> q8 = createAndBind("Q8", "F0000=Aardvark", "F0001"); routeAndTest(mockMessage(getArgsMapFromStrings("F0000")), q1); routeAndTest(mockMessage(getArgsMapFromStrings("F0000=Aardvark")), q1, q2); @@ -199,11 +197,11 @@ public class HeadersExchangeTest extends public void testAny() throws Exception { - AMQQueue q1 = createAndBind("Q1", "F0000", "F0001", "X-match=any"); - AMQQueue q2 = createAndBind("Q2", "F0000=Aardvark", "F0001=Bear", "X-match=any"); - AMQQueue q3 = createAndBind("Q3", "F0000", "F0001=Bear", "X-match=any"); - AMQQueue q4 = createAndBind("Q4", "F0000=Aardvark", "F0001", "X-match=any"); - AMQQueue q5 = createAndBind("Q5", "F0000=Apple", "F0001", "X-match=any"); + Queue<?> q1 = createAndBind("Q1", "F0000", "F0001", "X-match=any"); + Queue<?> q2 = createAndBind("Q2", "F0000=Aardvark", "F0001=Bear", "X-match=any"); + Queue<?> q3 = createAndBind("Q3", "F0000", "F0001=Bear", "X-match=any"); + Queue<?> q4 = createAndBind("Q4", "F0000=Aardvark", "F0001", "X-match=any"); + Queue<?> q5 = createAndBind("Q5", "F0000=Apple", "F0001", "X-match=any"); routeAndTest(mockMessage(getArgsMapFromStrings("F0000")), q1, q3); routeAndTest(mockMessage(getArgsMapFromStrings("F0000=Aardvark")), q1, q2, q3, q4); @@ -215,9 +213,9 @@ public class HeadersExchangeTest extends public void testOnUnbind() throws Exception { - AMQQueue q1 = createAndBind("Q1", "F0000"); - AMQQueue q2 = createAndBind("Q2", "F0000=Aardvark"); - AMQQueue q3 = createAndBind("Q3", "F0001"); + Queue<?> q1 = createAndBind("Q1", "F0000"); + Queue<?> q2 = createAndBind("Q2", "F0000=Aardvark"); + Queue<?> q3 = createAndBind("Q3", "F0001"); routeAndTest(mockMessage(getArgsMapFromStrings("F0000")), q1); routeAndTest(mockMessage(getArgsMapFromStrings("F0000=Aardvark")), q1, q2); @@ -232,8 +230,8 @@ public class HeadersExchangeTest extends public void testWithSelectors() throws Exception { - AMQQueue q1 = create("Q1"); - AMQQueue q2 = create("Q2"); + Queue<?> q1 = create("Q1"); + Queue<?> q2 = create("Q2"); bind("q1",getArgsMapFromStrings("F"), q1); bind("q1select",getArgsMapFromStrings("F", AMQPFilterTypes.JMS_SELECTOR.toString()+"=F='1'"), q1); bind("q2",getArgsMapFromStrings("F=1"), q2); @@ -243,7 +241,7 @@ public class HeadersExchangeTest extends routeAndTest(mockMessage(getArgsMapFromStrings("F=1")),q1,q2); - AMQQueue q3 = create("Q3"); + Queue<?> q3 = create("Q3"); bind("q3select",getArgsMapFromStrings("F", AMQPFilterTypes.JMS_SELECTOR.toString()+"=F='1'"), q3); routeAndTest(mockMessage(getArgsMapFromStrings("F=1")),q1,q2,q3); routeAndTest(mockMessage(getArgsMapFromStrings("F=2")),q1); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Fri Dec 11 15:50:19 2015 @@ -42,19 +42,18 @@ import org.apache.qpid.server.message.Se import org.apache.qpid.server.model.Binding; import org.apache.qpid.server.model.Exchange; 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.queue.BaseQueue; import org.apache.qpid.server.store.TransactionLogResource; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.server.virtualhost.QueueExistsException; -import org.apache.qpid.server.virtualhost.VirtualHostImpl; import org.apache.qpid.test.utils.QpidTestCase; public class TopicExchangeTest extends QpidTestCase { private TopicExchange _exchange; - private VirtualHostImpl _vhost; + private VirtualHost<?> _vhost; @Override @@ -89,7 +88,7 @@ public class TopicExchangeTest extends Q } } - private AMQQueue<?> createQueue(String name) throws QueueExistsException + private Queue<?> createQueue(String name) throws QueueExistsException { Map<String,Object> attributes = new HashMap<>(); attributes.put(Queue.NAME, name); @@ -98,7 +97,7 @@ public class TopicExchangeTest extends Q public void testNoRoute() throws Exception { - AMQQueue<?> queue = createQueue("a*#b"); + Queue<?> queue = createQueue("a*#b"); createBinding(UUID.randomUUID(), "a.*.#.b", queue, _exchange, null); @@ -109,7 +108,7 @@ public class TopicExchangeTest extends Q public void testDirectMatch() throws Exception { - AMQQueue<?> queue = createQueue("ab"); + Queue<?> queue = createQueue("ab"); createBinding(UUID.randomUUID(), "a.b", queue, _exchange, null); @@ -131,7 +130,7 @@ public class TopicExchangeTest extends Q public void testStarMatch() throws Exception { - AMQQueue<?> queue = createQueue("a*"); + Queue<?> queue = createQueue("a*"); createBinding(UUID.randomUUID(), "a.*", queue, _exchange, null); @@ -162,7 +161,7 @@ public class TopicExchangeTest extends Q public void testHashMatch() throws Exception { - AMQQueue<?> queue = createQueue("a#"); + Queue<?> queue = createQueue("a#"); createBinding(UUID.randomUUID(), "a.#", queue, _exchange, null); @@ -213,7 +212,7 @@ public class TopicExchangeTest extends Q public void testMidHash() throws Exception { - AMQQueue<?> queue = createQueue("a"); + Queue<?> queue = createQueue("a"); createBinding(UUID.randomUUID(), "a.*.#.b", queue, _exchange, null); routeMessage("a.c.d.b",0l); @@ -238,7 +237,7 @@ public class TopicExchangeTest extends Q public void testMatchAfterHash() throws Exception { - AMQQueue<?> queue = createQueue("a#"); + Queue<?> queue = createQueue("a#"); createBinding(UUID.randomUUID(), "a.*.#.b.c", queue, _exchange, null); @@ -278,7 +277,7 @@ public class TopicExchangeTest extends Q public void testHashAfterHash() throws Exception { - AMQQueue<?> queue = createQueue("a#"); + Queue<?> queue = createQueue("a#"); createBinding(UUID.randomUUID(), "a.*.#.b.c.#.d", queue, @@ -303,7 +302,7 @@ public class TopicExchangeTest extends Q public void testHashHash() throws Exception { - AMQQueue<?> queue = createQueue("a#"); + Queue<?> queue = createQueue("a#"); createBinding(UUID.randomUUID(), "a.#.*.#.d", queue, _exchange, null); int queueCount = routeMessage("a.c.b.b.c",0l); @@ -324,7 +323,7 @@ public class TopicExchangeTest extends Q public void testSubMatchFails() throws Exception { - AMQQueue<?> queue = createQueue("a"); + Queue<?> queue = createQueue("a"); createBinding(UUID.randomUUID(), "a.b.c.d", queue, _exchange, null); int queueCount = routeMessage("a.b.c",0l); @@ -336,7 +335,7 @@ public class TopicExchangeTest extends Q public void testMoreRouting() throws Exception { - AMQQueue<?> queue = createQueue("a"); + Queue<?> queue = createQueue("a"); createBinding(UUID.randomUUID(), "a.b", queue, _exchange, null); @@ -349,7 +348,7 @@ public class TopicExchangeTest extends Q public void testMoreQueue() throws Exception { - AMQQueue<?> queue = createQueue("a"); + Queue<?> queue = createQueue("a"); createBinding(UUID.randomUUID(), "a.b", queue, _exchange, null); @@ -362,7 +361,7 @@ public class TopicExchangeTest extends Q public void testRouteWithJMSSelector() throws Exception { - AMQQueue<?> queue = createQueue("queue1"); + Queue<?> queue = createQueue("queue1"); final String bindingKey = "bindingKey"; Map<String, Object> bindArgs = Collections.<String, Object>singletonMap(JMS_SELECTOR.toString(), "arg > 5"); @@ -396,7 +395,7 @@ public class TopicExchangeTest extends Q public void testUpdateBindingReplacingSelector() throws Exception { - AMQQueue<?> queue = createQueue("queue1"); + Queue<?> queue = createQueue("queue1"); final String bindingKey = "a"; Map<String, Object> originalArgs = Collections.<String, Object>singletonMap(JMS_SELECTOR.toString(), "arg > 5"); @@ -435,7 +434,7 @@ public class TopicExchangeTest extends Q // updates generated a NPE public void testUpdateBindingAddingSelector() throws Exception { - AMQQueue<?> queue = createQueue("queue1"); + Queue<?> queue = createQueue("queue1"); final String bindingKey = "a"; BindingImpl binding = createBinding(UUID.randomUUID(), bindingKey, queue, _exchange, null); @@ -470,8 +469,8 @@ public class TopicExchangeTest extends Q private BindingImpl createBinding(UUID id, String bindingKey, - AMQQueue queue, - ExchangeImpl exchange, + Queue<?> queue, + Exchange<?> exchange, 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/logging/VirtualHostLoggerTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java?rev=1719463&r1=1719462&r2=1719463&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java Fri Dec 11 15:50:19 2015 @@ -54,7 +54,7 @@ import org.apache.qpid.test.utils.QpidTe public class VirtualHostLoggerTest extends QpidTestCase { - private VirtualHost<?,?,?> _virtualHost; + private VirtualHost<?> _virtualHost; private TaskExecutor _taskExecutor; private File _baseFolder; private File _logFile; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
