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 2016/11/04 15:15:32 UTC
svn commit: r1768049 [2/3] - in /qpid/java/branches/remove-queue-runner: ./
bdbstore/src/main/java/org/apache/qpid/server/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkele...
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/CopyMessagesTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/CopyMessagesTransaction.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/CopyMessagesTransaction.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/CopyMessagesTransaction.java Fri Nov 4 15:15:32 2016
@@ -25,8 +25,7 @@ import java.util.List;
import org.apache.qpid.server.filter.MessageFilter;
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.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class CopyMessagesTransaction extends QueueEntryTransaction
{
@@ -42,10 +41,10 @@ public class CopyMessagesTransaction ext
}
@Override
- protected void updateEntry(QueueEntry entry, VirtualHost.Transaction txn)
+ protected void updateEntry(QueueEntry entry, QueueManagingVirtualHost.Transaction txn)
{
ServerMessage msg = entry.getMessage();
- if(msg != null && !msg.isReferenced((TransactionLogResource)_destinationQueue))
+ if(msg != null && !msg.isReferenced(_destinationQueue))
{
txn.copy(entry, _destinationQueue);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/DeleteMessagesTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/DeleteMessagesTransaction.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/DeleteMessagesTransaction.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/DeleteMessagesTransaction.java Fri Nov 4 15:15:32 2016
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.qpid.server.filter.MessageFilter;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class DeleteMessagesTransaction extends QueueEntryTransaction
{
@@ -37,7 +37,7 @@ public class DeleteMessagesTransaction e
}
@Override
- protected void updateEntry(QueueEntry entry, VirtualHost.Transaction txn)
+ protected void updateEntry(QueueEntry entry, QueueManagingVirtualHost.Transaction txn)
{
txn.dequeue(entry);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueImpl.java Fri Nov 4 15:15:32 2016
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class LastValueQueueImpl extends AbstractQueue<LastValueQueueImpl> implements LastValueQueue<LastValueQueueImpl>
{
@@ -35,7 +35,7 @@ public class LastValueQueueImpl extends
private String _lvqKey;
@ManagedObjectFactoryConstructor
- public LastValueQueueImpl(Map<String, Object> attributes, VirtualHost<?> virtualHost)
+ public LastValueQueueImpl(Map<String, Object> attributes, QueueManagingVirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/MoveMessagesTransaction.java Fri Nov 4 15:15:32 2016
@@ -25,8 +25,7 @@ import java.util.List;
import org.apache.qpid.server.filter.MessageFilter;
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.TransactionLogResource;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class MoveMessagesTransaction extends QueueEntryTransaction
{
@@ -42,10 +41,10 @@ public class MoveMessagesTransaction ext
}
@Override
- protected void updateEntry(QueueEntry entry, VirtualHost.Transaction txn)
+ protected void updateEntry(QueueEntry entry, QueueManagingVirtualHost.Transaction txn)
{
ServerMessage msg = entry.getMessage();
- if(msg != null && !msg.isReferenced((TransactionLogResource)_destinationQueue))
+ if(msg != null && !msg.isReferenced(_destinationQueue))
{
txn.move(entry, _destinationQueue);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java Fri Nov 4 15:15:32 2016
@@ -22,12 +22,12 @@ package org.apache.qpid.server.queue;
import java.util.Map;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public abstract class OutOfOrderQueue<X extends OutOfOrderQueue<X>> extends AbstractQueue<X>
{
- protected OutOfOrderQueue(Map<String, Object> attributes, VirtualHost<?> virtualHost)
+ protected OutOfOrderQueue(Map<String, Object> attributes, QueueManagingVirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueueImpl.java Fri Nov 4 15:15:32 2016
@@ -27,7 +27,7 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class PriorityQueueImpl extends OutOfOrderQueue<PriorityQueueImpl> implements PriorityQueue<PriorityQueueImpl>
{
@@ -38,7 +38,7 @@ public class PriorityQueueImpl extends O
private int _priorities;
@ManagedObjectFactoryConstructor
- public PriorityQueueImpl(Map<String, Object> attributes, VirtualHost<?> virtualHost)
+ public PriorityQueueImpl(Map<String, Object> attributes, QueueManagingVirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryTransaction.java Fri Nov 4 15:15:32 2016
@@ -26,9 +26,9 @@ import java.util.List;
import org.apache.qpid.server.filter.MessageFilter;
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.virtualhost.QueueManagingVirtualHost;
-abstract class QueueEntryTransaction implements VirtualHost.TransactionalOperation
+abstract class QueueEntryTransaction implements QueueManagingVirtualHost.TransactionalOperation
{
private final Queue _sourceQueue;
private final List<Long> _messageIds;
@@ -45,7 +45,7 @@ abstract class QueueEntryTransaction imp
}
@Override
- public final void withinTransaction(final VirtualHost.Transaction txn)
+ public final void withinTransaction(final QueueManagingVirtualHost.Transaction txn)
{
if(_limit != 0)
{
@@ -77,7 +77,7 @@ abstract class QueueEntryTransaction imp
}
- protected abstract void updateEntry(QueueEntry entry, VirtualHost.Transaction txn);
+ protected abstract void updateEntry(QueueEntry entry, QueueManagingVirtualHost.Transaction txn);
@Override
public final List<Long> getModifiedMessageIds()
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueImpl.java Fri Nov 4 15:15:32 2016
@@ -25,9 +25,9 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class SortedQueueImpl extends OutOfOrderQueue<SortedQueueImpl> implements SortedQueue<SortedQueueImpl>
{
@@ -41,7 +41,7 @@ public class SortedQueueImpl extends Out
private SortedQueueEntryList _entries;
@ManagedObjectFactoryConstructor
- public SortedQueueImpl(Map<String, Object> attributes, VirtualHost<?> virtualHost)
+ public SortedQueueImpl(Map<String, Object> attributes, QueueManagingVirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueueImpl.java Fri Nov 4 15:15:32 2016
@@ -23,14 +23,14 @@ package org.apache.qpid.server.queue;
import java.util.Map;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class StandardQueueImpl extends AbstractQueue<StandardQueueImpl> implements StandardQueue<StandardQueueImpl>
{
private StandardQueueEntryList _entries;
@ManagedObjectFactoryConstructor
- public StandardQueueImpl(final Map<String, Object> arguments, final VirtualHost<?> virtualHost)
+ public StandardQueueImpl(final Map<String, Object> arguments, final QueueManagingVirtualHost<?> virtualHost)
{
super(arguments, virtualHost);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java Fri Nov 4 15:15:32 2016
@@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.KeyStoreMessages;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.KeyStore;
@@ -115,7 +115,7 @@ public abstract class AbstractKeyStore<X
else
{
final int frequency = checkFrequency;
- getBroker().addChangeListener(new ConfigurationChangeListener()
+ getBroker().addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
@@ -134,39 +134,6 @@ public abstract class AbstractKeyStore<X
getBroker().removeChangeListener(this);
}
}
-
- @Override
- public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
});
}
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSource.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSource.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSource.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSource.java Fri Nov 4 15:15:32 2016
@@ -42,7 +42,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.TrustStore;
@@ -63,7 +63,7 @@ public class TrustStoreMessageSource ext
super(getSourceNameFromTrustStore(trustStore), virtualHost);
_virtualHost = virtualHost;
_trustStore = trustStore;
- _trustStore.addChangeListener(new ConfigurationChangeListener()
+ _trustStore.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
@@ -75,18 +75,6 @@ public class TrustStoreMessageSource ext
}
@Override
- public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
- @Override
public void attributeSet(final ConfiguredObject<?> object,
final String attributeName,
final Object oldAttributeValue,
@@ -95,17 +83,6 @@ public class TrustStoreMessageSource ext
updateCertCache();
}
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
});
if(_trustStore.getState() == State.ACTIVE)
{
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSourceCreator.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSourceCreator.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSourceCreator.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/TrustStoreMessageSourceCreator.java Fri Nov 4 15:15:32 2016
@@ -22,8 +22,8 @@ package org.apache.qpid.server.security;
import java.util.Collection;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.TrustStore;
@@ -58,14 +58,9 @@ public class TrustStoreMessageSourceCrea
updateTrustStoreSourceRegistration(registry, trustStore);
trustStore.addChangeListener(trustStoreChangeListener);
}
- broker.addChangeListener(new ConfigurationChangeListener()
+ broker.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
- public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
- {
- }
-
- @Override
public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
{
if (child instanceof TrustStore)
@@ -89,27 +84,6 @@ public class TrustStoreMessageSourceCrea
registry.removeSystemNode(TrustStoreMessageSource.getSourceNameFromTrustStore(trustStore));
}
}
-
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
});
}
@@ -141,7 +115,7 @@ public class TrustStoreMessageSourceCrea
}
}
- private class TrustStoreChangeListener implements ConfigurationChangeListener
+ private class TrustStoreChangeListener extends AbstractConfigurationChangeListener
{
private final SystemNodeRegistry _registry;
@@ -159,19 +133,6 @@ public class TrustStoreMessageSourceCrea
updateTrustStoreSourceRegistration(_registry, (TrustStore<?>)object);
}
-
- @Override
- public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
- @Override
- public void childRemoved(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
- {
-
- }
-
@Override
public void attributeSet(final ConfiguredObject<?> object,
final String attributeName,
@@ -180,17 +141,5 @@ public class TrustStoreMessageSourceCrea
{
updateTrustStoreSourceRegistration(_registry, (TrustStore<?>)object);
}
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
}
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java Fri Nov 4 15:15:32 2016
@@ -35,19 +35,19 @@ import java.util.UUID;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.filter.FilterSupport;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
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.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public class VirtualHostStoreUpgraderAndRecoverer
{
@@ -451,7 +451,7 @@ public class VirtualHostStoreUpgraderAnd
throw new IllegalConfigurationException("Queue name is not found in queue configuration entry attributes: " + attributes);
}
- String dleSuffix = System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DEFAULT_DLE_NAME_SUFFIX);
+ String dleSuffix = System.getProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DEFAULT_DLE_NAME_SUFFIX);
String dleExchangeName = queueName + dleSuffix;
ConfiguredObjectRecord exchangeRecord = findConfiguredObjectRecordInUpdateMap("Exchange", dleExchangeName);
@@ -626,15 +626,9 @@ public class VirtualHostStoreUpgraderAnd
}
});
}
- _virtualHostNode.addChangeListener(new ConfigurationChangeListener()
+ _virtualHostNode.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
- public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
- {
-
- }
-
- @Override
public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
{
if(child instanceof VirtualHost)
@@ -664,26 +658,6 @@ public class VirtualHostStoreUpgraderAnd
}
}
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
-
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
-
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
-
- }
});
if(isNew)
{
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java Fri Nov 4 15:15:32 2016
@@ -27,18 +27,18 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
-import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.server.protocol.AMQSessionModel;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.transport.Xid;
public class DtxRegistry
{
private final Map<ComparableXid, DtxBranch> _branches = new HashMap<ComparableXid, DtxBranch>();
- private final VirtualHost<?> _virtualHost;
+ private final QueueManagingVirtualHost<?> _virtualHost;
- public DtxRegistry(final VirtualHost<?> virtualHost)
+ public DtxRegistry(final QueueManagingVirtualHost<?> virtualHost)
{
_virtualHost = virtualHost;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Nov 4 15:15:32 2016
@@ -110,11 +110,9 @@ import org.apache.qpid.server.security.S
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.stats.StatisticsCounter;
-import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.Event;
-import org.apache.qpid.server.store.EventListener;
import org.apache.qpid.server.store.GenericRecoverer;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.store.MessageStore;
@@ -145,7 +143,7 @@ import org.apache.qpid.server.util.MapVa
import org.apache.qpid.util.Strings;
public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> extends AbstractConfiguredObject<X>
- implements VirtualHost<X>, EventListener, StatisticsGatherer
+ implements QueueManagingVirtualHost<X>
{
private final Collection<ConnectionValidator> _connectionValidators = new ArrayList<>();
@@ -392,7 +390,7 @@ public abstract class AbstractVirtualHos
protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
{
super.validateChange(proxyForValidation, changedAttributes);
- VirtualHost<?> virtualHost = (VirtualHost<?>) proxyForValidation;
+ QueueManagingVirtualHost<?> virtualHost = (QueueManagingVirtualHost<?>) proxyForValidation;
if(changedAttributes.contains(GLOBAL_ADDRESS_DOMAINS))
{
@@ -508,7 +506,7 @@ public abstract class AbstractVirtualHos
return _messageStore;
}
- private void validateConnectionThreadPoolSettings(VirtualHost<?> virtualHost)
+ private void validateConnectionThreadPoolSettings(QueueManagingVirtualHost<?> virtualHost)
{
if (virtualHost.getConnectionThreadPoolSize() < 1)
{
@@ -1772,7 +1770,7 @@ public abstract class AbstractVirtualHos
}
}
- private class TargetSizeAssigningListener implements ConfigurationChangeListener
+ private class TargetSizeAssigningListener extends AbstractConfigurationChangeListener
{
@Override
public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
@@ -1792,31 +1790,6 @@ public abstract class AbstractVirtualHos
allocateTargetSizeToQueues();
}
}
-
- @Override
- public void stateChanged(final ConfiguredObject<?> object,
- final State oldState,
- final State newState)
- {
- }
-
- @Override
- public void attributeSet(final ConfiguredObject<?> object,
- final String attributeName,
- final Object oldAttributeValue,
- final Object newAttributeValue)
- {
- }
-
- @Override
- public void bulkChangeStart(final ConfiguredObject<?> object)
- {
- }
-
- @Override
- public void bulkChangeEnd(final ConfiguredObject<?> object)
- {
- }
}
private class VirtualHostHouseKeepingTask extends HouseKeepingTask
@@ -2309,12 +2282,12 @@ public abstract class AbstractVirtualHos
private static String getDeadLetterQueueName(String name)
{
- return name + System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX);
+ return name + System.getProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX);
}
private static String getDeadLetterExchangeName(String name)
{
- return name + System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, VirtualHost.DEFAULT_DLE_NAME_SUFFIX);
+ return name + System.getProperty(QueueManagingVirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, QueueManagingVirtualHost.DEFAULT_DLE_NAME_SUFFIX);
}
@Override
@@ -2745,17 +2718,11 @@ public abstract class AbstractVirtualHos
return !(_systemNodeSources.isEmpty() && getChildren(Queue.class).isEmpty());
}
- private final class AccessControlProviderListener implements ConfigurationChangeListener
+ private final class AccessControlProviderListener extends AbstractConfigurationChangeListener
{
private final Set<ConfiguredObject<?>> _bulkChanges = new HashSet<>();
@Override
- public void stateChanged(final ConfiguredObject<?> object, final State oldState, final State newState)
- {
-
- }
-
- @Override
public void childAdded(final ConfiguredObject<?> object, final ConfiguredObject<?> child)
{
if(object.getCategoryClass() == VirtualHost.class && child.getCategoryClass() == VirtualHostAccessControlProvider.class)
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java Fri Nov 4 15:15:32 2016
@@ -45,7 +45,6 @@ import org.apache.qpid.server.logging.su
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.QueueEntry;
import org.apache.qpid.server.store.MessageEnqueueRecord;
@@ -70,7 +69,7 @@ public class AsynchronousMessageStoreRec
private AsynchronousRecoverer _asynchronousRecoverer;
@Override
- public ListenableFuture<Void> recover(final VirtualHost<?> virtualHost)
+ public ListenableFuture<Void> recover(final QueueManagingVirtualHost<?> virtualHost)
{
_asynchronousRecoverer = new AsynchronousRecoverer(virtualHost);
@@ -91,7 +90,7 @@ public class AsynchronousMessageStoreRec
private static final Logger LOGGER = LoggerFactory.getLogger(AsynchronousRecoverer.class);
public static final int THREAD_POOL_SHUTDOWN_TIMEOUT = 5000;
- private final VirtualHost<?> _virtualHost;
+ private final QueueManagingVirtualHost<?> _virtualHost;
private final EventLogger _eventLogger;
private final MessageStore _store;
private final MessageStoreLogSubject _logSubject;
@@ -103,7 +102,7 @@ public class AsynchronousMessageStoreRec
private final MessageStore.MessageStoreReader _storeReader;
private AtomicBoolean _continueRecovery = new AtomicBoolean(true);
- private AsynchronousRecoverer(final VirtualHost<?> virtualHost)
+ private AsynchronousRecoverer(final QueueManagingVirtualHost<?> virtualHost)
{
_virtualHost = virtualHost;
_eventLogger = virtualHost.getEventLogger();
@@ -145,7 +144,7 @@ public class AsynchronousMessageStoreRec
}
}
- public VirtualHost<?> getVirtualHost()
+ public QueueManagingVirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageStoreRecoverer.java Fri Nov 4 15:15:32 2016
@@ -22,11 +22,9 @@ 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(VirtualHost<?> virtualHost);
+ ListenableFuture<Void> recover(QueueManagingVirtualHost<?> virtualHost);
/**
* Cancels any in-progress message store recovery. If message store recovery has already
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java Fri Nov 4 15:15:32 2016
@@ -20,12 +20,10 @@
package org.apache.qpid.server.virtualhost;
import org.apache.qpid.server.model.ManagedAttribute;
-import org.apache.qpid.server.model.ManagedOperation;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.SizeMonitoringSettings;
public interface ProvidedStoreVirtualHost<X extends ProvidedStoreVirtualHost<X>>
- extends VirtualHost<X>,
+ extends QueueManagingVirtualHost<X>,
SizeMonitoringSettings,
NonStandardVirtualHost<X>
{
@@ -34,7 +32,4 @@ public interface ProvidedStoreVirtualHos
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreOverfullSize();
-
- @ManagedOperation(description = "Resets statistics on this object and all child objects", changesConfiguredObjectState = false, nonModifying = true)
- void resetStatistics();
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java Fri Nov 4 15:15:32 2016
@@ -37,7 +37,6 @@ import org.apache.qpid.server.logging.su
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.QueueEntry;
import org.apache.qpid.server.store.MessageEnqueueRecord;
@@ -62,7 +61,7 @@ public class SynchronousMessageStoreReco
private static final Logger _logger = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class);
@Override
- public ListenableFuture<Void> recover(VirtualHost<?> virtualHost)
+ public ListenableFuture<Void> recover(QueueManagingVirtualHost<?> virtualHost)
{
EventLogger eventLogger = virtualHost.getEventLogger();
MessageStore store = virtualHost.getMessageStore();
@@ -154,14 +153,14 @@ public class SynchronousMessageStoreReco
private static class MessageInstanceVisitor implements MessageInstanceHandler
{
- private final VirtualHost<?> _virtualHost;
+ private final QueueManagingVirtualHost<?> _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 VirtualHost<?> virtualHost,
+ private MessageInstanceVisitor(final QueueManagingVirtualHost<?> virtualHost,
final MessageStore store,
final Map<String, Integer> queueRecoveries,
final Map<Long, ServerMessage<?>> recoveredMessages,
@@ -225,7 +224,7 @@ public class SynchronousMessageStoreReco
private static class DistributedTransactionVisitor implements DistributedTransactionHandler
{
- private final VirtualHost<?> _virtualHost;
+ private final QueueManagingVirtualHost<?> _virtualHost;
private final MessageStore _store;
private final EventLogger _eventLogger;
private final MessageStoreLogSubject _logSubject;
@@ -233,7 +232,7 @@ public class SynchronousMessageStoreReco
private final Map<Long, ServerMessage<?>> _recoveredMessages;
private final Map<Long, StoredMessage<?>> _unusedMessages;
- private DistributedTransactionVisitor(final VirtualHost<?> virtualHost,
+ private DistributedTransactionVisitor(final QueueManagingVirtualHost<?> virtualHost,
final MessageStore store,
final EventLogger eventLogger,
final MessageStoreLogSubject logSubject,
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java Fri Nov 4 15:15:32 2016
@@ -45,6 +45,7 @@ import org.apache.qpid.server.store.Conf
import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.VirtualHostStoreUpgraderAndRecoverer;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandardVirtualHostNode<X>> extends AbstractVirtualHostNode<X>
implements VirtualHostNode<X>
@@ -107,11 +108,11 @@ public abstract class AbstractStandardVi
getEventLogger().message(getConfigurationStoreLogSubject(), ConfigStoreMessages.RECOVERY_COMPLETE());
- VirtualHost<?> host = getVirtualHost();
+ QueueManagingVirtualHost<?> host = getVirtualHost();
if (host != null)
{
- final VirtualHost<?> recoveredHost = host;
+ final QueueManagingVirtualHost<?> recoveredHost = host;
final ListenableFuture<Void> openFuture;
recoveredHost.setFirstOpening(isNew && initialRecords.length == 0);
openFuture = Subject.doAs(getSubjectWithAddedSystemRights(),
@@ -132,6 +133,19 @@ public abstract class AbstractStandardVi
}
}
+ @Override
+ public QueueManagingVirtualHost<?> getVirtualHost()
+ {
+ VirtualHost<?> vhost = super.getVirtualHost();
+ if(vhost == null || vhost instanceof QueueManagingVirtualHost)
+ {
+ return (QueueManagingVirtualHost<?>)vhost;
+ }
+ else
+ {
+ throw new IllegalStateException(this + " has a virtual host which is not a queue managing virtual host " + vhost);
+ }
+ }
@Override
protected ConfiguredObjectRecord enrichInitialVirtualHostRootRecord(final ConfiguredObjectRecord vhostRecord)
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java Fri Nov 4 15:15:32 2016
@@ -20,20 +20,16 @@
*/
package org.apache.qpid.server.virtualhostnode;
-import java.security.AccessControlContext;
import java.security.Principal;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ScheduledFuture;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -41,23 +37,15 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.Content;
-import org.apache.qpid.server.model.ManageableMessage;
-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.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.model.preferences.UserPreferences;
import org.apache.qpid.server.protocol.LinkRegistry;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.txn.DtxRegistry;
-import org.apache.qpid.server.virtualhost.HouseKeepingTask;
-import org.apache.qpid.server.virtualhost.NodeAutoCreationPolicy;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
@ManagedObject( category = false, type = RedirectingVirtualHostImpl.VIRTUAL_HOST_TYPE, register = false,
@@ -71,44 +59,6 @@ class RedirectingVirtualHostImpl
private final Broker<?> _broker;
private final VirtualHostPrincipal _principal;
- @ManagedAttributeField
- private boolean _queue_deadLetterQueueEnabled;
-
- @ManagedAttributeField
- private long _housekeepingCheckPeriod;
-
- @ManagedAttributeField
- private long _storeTransactionIdleTimeoutClose;
-
- @ManagedAttributeField
- private long _storeTransactionIdleTimeoutWarn;
-
- @ManagedAttributeField
- private long _storeTransactionOpenTimeoutClose;
-
- @ManagedAttributeField
- private long _storeTransactionOpenTimeoutWarn;
- @ManagedAttributeField
- private int _housekeepingThreadCount;
-
- @ManagedAttributeField
- private int _numberOfSelectors;
-
- @ManagedAttributeField
- private int _connectionThreadPoolSize;
-
- @ManagedAttributeField
- private List<String> _enabledConnectionValidators;
-
- @ManagedAttributeField
- private List<String> _disabledConnectionValidators;
-
- @ManagedAttributeField
- private List<String> _globalAddressDomains;
-
- @ManagedAttributeField
- private List<NodeAutoCreationPolicy> _nodeAutoCreationPolicies;
-
@ManagedObjectFactoryConstructor
public RedirectingVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
@@ -148,11 +98,6 @@ class RedirectingVirtualHostImpl
return BrokerModel.MODEL_VERSION;
}
- @Override
- public void executeTask(final String name, Runnable task, AccessControlContext context)
- {
- throwUnsupportedForRedirector();
- }
@Override
protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(final Class<C> childClass,
@@ -176,125 +121,12 @@ class RedirectingVirtualHostImpl
}
@Override
- public <T extends ConfiguredObject<?>> T getAttainedChildFromAddress(final Class<T> childClass,
- final String address)
- {
- return null;
- }
-
- @Override
- public void executeTransaction(final TransactionalOperation op)
- {
- throwUnsupportedForRedirector();
- }
-
- @Override
public String getRedirectHost(final AmqpPort<?> port)
{
return ((RedirectingVirtualHostNode<?>)(getParent(VirtualHostNode.class))).getRedirects().get(port);
}
- @Override
- public boolean isQueue_deadLetterQueueEnabled()
- {
- return false;
- }
-
- @Override
- public long getHousekeepingCheckPeriod()
- {
- return 0;
- }
-
- @Override
- public long getStoreTransactionIdleTimeoutClose()
- {
- return 0;
- }
-
- @Override
- public long getStoreTransactionIdleTimeoutWarn()
- {
- return 0;
- }
-
- @Override
- public long getStoreTransactionOpenTimeoutClose()
- {
- return 0;
- }
-
- @Override
- public long getStoreTransactionOpenTimeoutWarn()
- {
- return 0;
- }
-
- @Override
- public int getHousekeepingThreadCount()
- {
- return 0;
- }
-
- @Override
- public List<NodeAutoCreationPolicy> getNodeAutoCreationPolicies()
- {
- return Collections.emptyList();
- }
-
- @Override
- public int getConnectionThreadPoolSize()
- {
- return 0;
- }
-
- @Override
- public int getNumberOfSelectors()
- {
- return 0;
- }
-
- @Override
- public long getQueueCount()
- {
- return 0;
- }
-
- @Override
- public long getExchangeCount()
- {
- return 0;
- }
-
- @Override
- public long getConnectionCount()
- {
- return 0;
- }
- @Override
- public long getBytesIn()
- {
- return 0;
- }
-
- @Override
- public long getBytesOut()
- {
- return 0;
- }
-
- @Override
- public long getMessagesIn()
- {
- return 0;
- }
-
- @Override
- public long getMessagesOut()
- {
- return 0;
- }
@Override
public Collection<? extends Connection<?>> getConnections()
@@ -303,58 +135,12 @@ class RedirectingVirtualHostImpl
}
@Override
- public Connection<?> getConnection(String name)
- {
- return null;
- }
-
- @Override
- public Map<String, Object> extractConfig(boolean includeSecureAttributes)
- {
- return Collections.emptyMap();
- }
-
- @Override
- public Content exportMessageStore()
- {
- throwUnsupportedForRedirector();
-
- return null;
- }
-
- @Override
- public void importMessageStore(final String source)
- {
- throwUnsupportedForRedirector();
- }
-
- @Override
- public int publishMessage(final ManageableMessage message)
- {
- throwUnsupportedForRedirector();
- return 0;
- }
-
- @Override
public MessageSource getAttainedMessageSource(final String name)
{
return null;
}
@Override
- public Queue<?> getAttainedQueue(final UUID id)
- {
- return null;
- }
-
-
- @Override
- public DurableConfigurationStore getDurableConfigurationStore()
- {
- return null;
- }
-
- @Override
public MessageDestination getDefaultDestination()
{
return null;
@@ -388,29 +174,6 @@ class RedirectingVirtualHostImpl
}
@Override
- public void setTargetSize(final long targetSize)
- {
-
- }
-
- @Override
- public long getTargetSize()
- {
- return 0l;
- }
-
- @Override
- public long getTotalQueueDepthBytes()
- {
- return 0l;
- }
-
- @Override
- public void scheduleHouseKeepingTask(final long period, final HouseKeepingTask task)
- {
- }
-
- @Override
public DtxRegistry getDtxRegistry()
{
return null;
@@ -423,57 +186,15 @@ class RedirectingVirtualHostImpl
}
@Override
- public ScheduledFuture<?> scheduleTask(final long delay, final Runnable timeoutTask)
- {
- throwUnsupportedForRedirector();
- return null;
- }
-
- @Override
- public EventLogger getEventLogger()
- {
- return null;
- }
-
- @Override
public boolean authoriseCreateConnection(final AMQPConnection<?> connection)
{
return false;
}
@Override
- public List<String> getEnabledConnectionValidators()
- {
- return _enabledConnectionValidators;
- }
-
- @Override
- public List<String> getDisabledConnectionValidators()
- {
- return _disabledConnectionValidators;
- }
-
- @Override
public List<String> getGlobalAddressDomains()
{
- return _globalAddressDomains;
- }
-
- @Override
- public String getLocalAddress(final String routingAddress)
- {
- String localAddress = routingAddress;
- if(getGlobalAddressDomains() != null)
- {
- for(String domain : getGlobalAddressDomains())
- {
- if(localAddress.length() > routingAddress.length() - domain.length() && routingAddress.startsWith(domain + "/"))
- {
- localAddress = routingAddress.substring(domain.length());
- }
- }
- }
- return localAddress;
+ return Collections.emptyList();
}
@Override
@@ -500,16 +221,4 @@ class RedirectingVirtualHostImpl
+ " does not permit this operation.");
}
- @Override
- public void setFirstOpening(final boolean firstOpening)
- {
-
- }
-
- @Override
- public UserPreferences createUserPreferences(final ConfiguredObject<?> object)
- {
- throwUnsupportedForRedirector();
- return null;
- }
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Fri Nov 4 15:15:32 2016
@@ -31,10 +31,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -45,15 +41,20 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Broker;
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.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.queue.BaseQueue;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
public class FanoutExchangeTest extends QpidTestCase
{
private FanoutExchange _exchange;
- private VirtualHost _virtualHost;
+ private QueueManagingVirtualHost _virtualHost;
private TaskExecutor _taskExecutor;
public void setUp()
@@ -74,7 +75,7 @@ public class FanoutExchangeTest extends
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
when(_virtualHost.getEventLogger()).thenReturn(new EventLogger());
when(_virtualHost.getTaskExecutor()).thenReturn(_taskExecutor);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java Fri Nov 4 15:15:32 2016
@@ -39,7 +39,7 @@ import org.apache.qpid.server.model.Bind
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.model.VirtualHost;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -158,7 +158,7 @@ public class HeadersBindingTest extends
_queue = mock(Queue.class);
TaskExecutor executor = new CurrentThreadTaskExecutor();
executor.start();
- VirtualHost vhost = mock(VirtualHost.class);
+ QueueManagingVirtualHost vhost = mock(QueueManagingVirtualHost.class);
when(_queue.getVirtualHost()).thenReturn(vhost);
when(_queue.getModel()).thenReturn(BrokerModel.getInstance());
when(_queue.getTaskExecutor()).thenReturn(executor);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Fri Nov 4 15:15:32 2016
@@ -34,9 +34,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -47,17 +44,21 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
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.model.VirtualHostNode;
import org.apache.qpid.server.queue.BaseQueue;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
+import org.apache.qpid.test.utils.QpidTestCase;
public class HeadersExchangeTest extends QpidTestCase
{
private HeadersExchange _exchange;
- private VirtualHost _virtualHost;
+ private QueueManagingVirtualHost _virtualHost;
private TaskExecutor _taskExecutor;
private ConfiguredObjectFactoryImpl _factory;
@@ -68,7 +69,7 @@ public class HeadersExchangeTest extends
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
- _virtualHost = mock(VirtualHost.class);
+ _virtualHost = mock(QueueManagingVirtualHost.class);
Broker broker = mock(Broker.class);
when(broker.getCategoryClass()).thenReturn(Broker.class);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java Fri Nov 4 15:15:32 2016
@@ -53,6 +53,7 @@ import org.apache.qpid.server.store.pref
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.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -156,13 +157,13 @@ public class BrokerTestHelper
{
}
- public static VirtualHost<?> createVirtualHost(Map<String, Object> attributes)
+ public static QueueManagingVirtualHost<?> createVirtualHost(Map<String, Object> attributes)
{
Broker<?> broker = createBrokerMock(createAccessControlMock());
return createVirtualHost(attributes, broker, false, createAccessControlMock());
}
- private static VirtualHost<?> createVirtualHost(final Map<String, Object> attributes,
+ private static QueueManagingVirtualHost<?> createVirtualHost(final Map<String, Object> attributes,
final Broker<?> broker, boolean defaultVHN, AccessControl accessControl)
{
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
@@ -201,17 +202,17 @@ public class BrokerTestHelper
return host;
}
- public static VirtualHost<?> createVirtualHost(String name) throws Exception
+ public static QueueManagingVirtualHost<?> createVirtualHost(String name) throws Exception
{
return createVirtualHost(name, createBrokerMock(createAccessControlMock()), false, createAccessControlMock());
}
- public static VirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN) throws Exception
+ public static QueueManagingVirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN) throws Exception
{
return createVirtualHost(name, broker, defaultVHN, createAccessControlMock());
}
- private static VirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN, AccessControl accessControl) throws Exception
+ private static QueueManagingVirtualHost<?> createVirtualHost(String name, Broker<?> broker, boolean defaultVHN, AccessControl accessControl) throws Exception
{
Map<String,Object> attributes = new HashMap<>();
attributes.put(org.apache.qpid.server.model.VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
@@ -252,7 +253,7 @@ public class BrokerTestHelper
public static Exchange<?> createExchange(String hostName, final boolean durable, final EventLogger eventLogger) throws Exception
{
- final VirtualHost virtualHost = mockWithSystemPrincipal(VirtualHost.class, SYSTEM_PRINCIPAL);
+ final QueueManagingVirtualHost virtualHost = mockWithSystemPrincipal(QueueManagingVirtualHost.class, SYSTEM_PRINCIPAL);
when(virtualHost.getName()).thenReturn(hostName);
when(virtualHost.getEventLogger()).thenReturn(eventLogger);
when(virtualHost.getDurableConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Fri Nov 4 15:15:32 2016
@@ -67,6 +67,7 @@ import org.apache.qpid.server.store.pref
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.transport.AbstractAMQPConnection;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -78,7 +79,7 @@ public class VirtualHostTest extends Qpi
private TaskExecutor _taskExecutor;
private VirtualHostNode _virtualHostNode;
private DurableConfigurationStore _configStore;
- private VirtualHost<?> _virtualHost;
+ private QueueManagingVirtualHost<?> _virtualHost;
private StoreConfigurationChangeListener _storeConfigurationChangeListener;
private PreferenceStore _preferenceStore;
@@ -144,7 +145,7 @@ public class VirtualHostTest extends Qpi
public void testNewVirtualHost()
{
String virtualHostName = getName();
- VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
+ QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertNotNull("Unexpected id", virtualHost.getId());
assertEquals("Unexpected name", virtualHostName, virtualHost.getName());
@@ -172,11 +173,11 @@ public class VirtualHostTest extends Qpi
VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
- virtualHost.stop();
+ ((AbstractConfiguredObject<?>)virtualHost).stop();
assertEquals("Unexpected state", State.STOPPED, virtualHost.getState());
verify(_preferenceStore).close();
- virtualHost.start();
+ ((AbstractConfiguredObject<?>)virtualHost).start();
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
verify(_configStore, times(1)).update(eq(true), matchesRecord(virtualHost.getId(), virtualHost.getType()));
@@ -215,7 +216,7 @@ public class VirtualHostTest extends Qpi
}
- virtualHost.stop();
+ ((AbstractConfiguredObject<?>)virtualHost).stop();
assertEquals("Unexpected state", State.STOPPED, virtualHost.getState());
assertEquals("Unexpected number of queues after stop", 0, virtualHost.getChildren(Queue.class).size());
assertEquals("Unexpected number of exchanges after stop", 0, virtualHost.getChildren(Exchange.class).size());
@@ -240,7 +241,7 @@ public class VirtualHostTest extends Qpi
}
}).when(_configStore).reload(any(ConfiguredObjectRecordHandler.class));
- virtualHost.start();
+ ((AbstractConfiguredObject<?>)virtualHost).start();
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
assertEquals("Unexpected number of queues after restart", 1, virtualHost.getChildren(Queue.class).size());
@@ -252,7 +253,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
+ QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
@@ -264,7 +265,7 @@ public class VirtualHostTest extends Qpi
assertEquals("Unexpected number of connections after connection registered", 1, virtualHost.getConnectionCount());
- virtualHost.stop();
+ ((AbstractConfiguredObject<?>)virtualHost).stop();
assertEquals("Unexpected state", State.STOPPED, virtualHost.getState());
assertEquals("Unexpected number of connections after virtualhost stopped",
@@ -278,7 +279,7 @@ public class VirtualHostTest extends Qpi
{
String virtualHostName = getName();
- VirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
+ QueueManagingVirtualHost<?> virtualHost = createVirtualHost(virtualHostName);
assertEquals("Unexpected state", State.ACTIVE, virtualHost.getState());
AbstractAMQPConnection connection = createMockProtocolConnection(virtualHost);
@@ -374,7 +375,7 @@ public class VirtualHostTest extends Qpi
try
{
- virtualHost.stop();
+ ((AbstractConfiguredObject<?>)virtualHost).stop();
fail("Exception not thrown");
}
catch (AccessControlException ace)
@@ -419,7 +420,7 @@ public class VirtualHostTest extends Qpi
{
try
{
- createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(VirtualHost.NUMBER_OF_SELECTORS, "-1"));
+ createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS, "-1"));
fail("Exception not thrown for negative number of selectors");
}
catch (IllegalConfigurationException e)
@@ -428,7 +429,7 @@ public class VirtualHostTest extends Qpi
}
try
{
- createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(VirtualHost.CONNECTION_THREAD_POOL_SIZE, "-1"));
+ createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(QueueManagingVirtualHost.CONNECTION_THREAD_POOL_SIZE, "-1"));
fail("Exception not thrown for negative connection thread pool size");
}
catch (IllegalConfigurationException e)
@@ -437,7 +438,7 @@ public class VirtualHostTest extends Qpi
}
try
{
- createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(VirtualHost.NUMBER_OF_SELECTORS, VirtualHost.DEFAULT_VIRTUALHOST_CONNECTION_THREAD_POOL_SIZE));
+ createVirtualHost(getTestName(), Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS, QueueManagingVirtualHost.DEFAULT_VIRTUALHOST_CONNECTION_THREAD_POOL_SIZE));
fail("Exception not thrown for number of selectors equal to connection thread pool size");
}
catch (IllegalConfigurationException e)
@@ -448,10 +449,10 @@ public class VirtualHostTest extends Qpi
public void testChangeValidation() throws Exception
{
- VirtualHost<?> virtualHost = createVirtualHost(getTestName());
+ QueueManagingVirtualHost<?> virtualHost = createVirtualHost(getTestName());
try
{
- virtualHost.setAttributes(Collections.<String, Object>singletonMap(VirtualHost.NUMBER_OF_SELECTORS, "-1"));
+ virtualHost.setAttributes(Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS, "-1"));
fail("Exception not thrown for negative number of selectors");
}
catch (IllegalConfigurationException e)
@@ -460,7 +461,7 @@ public class VirtualHostTest extends Qpi
}
try
{
- virtualHost.setAttributes(Collections.<String, Object>singletonMap(VirtualHost.CONNECTION_THREAD_POOL_SIZE,
+ virtualHost.setAttributes(Collections.<String, Object>singletonMap(QueueManagingVirtualHost.CONNECTION_THREAD_POOL_SIZE,
"-1"));
fail("Exception not thrown for negative connection thread pool size");
}
@@ -470,7 +471,7 @@ public class VirtualHostTest extends Qpi
}
try
{
- virtualHost.setAttributes(Collections.<String, Object>singletonMap(VirtualHost.NUMBER_OF_SELECTORS, VirtualHost.DEFAULT_VIRTUALHOST_CONNECTION_THREAD_POOL_SIZE));
+ virtualHost.setAttributes(Collections.<String, Object>singletonMap(QueueManagingVirtualHost.NUMBER_OF_SELECTORS, QueueManagingVirtualHost.DEFAULT_VIRTUALHOST_CONNECTION_THREAD_POOL_SIZE));
fail("Exception not thrown for number of selectors equal to connection thread pool size");
}
catch (IllegalConfigurationException e)
@@ -481,7 +482,7 @@ public class VirtualHostTest extends Qpi
public void testRegisterConnection() throws Exception
{
- VirtualHost<?> vhost = createVirtualHost("sdf");
+ QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
AMQPConnection<?> connection = getMockConnection();
assertEquals("unexpected number of connections before test", 0, vhost.getConnectionCount());
@@ -492,23 +493,23 @@ public class VirtualHostTest extends Qpi
public void testStopVirtualhostClosesConnections() throws Exception
{
- VirtualHost<?> vhost = createVirtualHost("sdf");
+ QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
AMQPConnection<?> connection = getMockConnection();
vhost.registerConnection(connection);
assertEquals("unexpected number of connections after registerConnection", 1, vhost.getConnectionCount());
assertEquals("unexpected connection object", Collections.singleton(connection), vhost.getConnections());
- vhost.stop();
+ ((AbstractConfiguredObject<?>)vhost).stop();
verify(connection).stopConnection();
verify(connection).closeAsync();
}
public void testRegisterConnectionOnStoppedVirtualhost() throws Exception
{
- VirtualHost<?> vhost = createVirtualHost("sdf");
+ QueueManagingVirtualHost<?> vhost = createVirtualHost("sdf");
AMQPConnection<?> connection = getMockConnection();
- vhost.stop();
+ ((AbstractConfiguredObject<?>)vhost).stop();
try
{
vhost.registerConnection(connection);
@@ -519,7 +520,7 @@ public class VirtualHostTest extends Qpi
// pass
}
assertEquals("unexpected number of connections", 0, vhost.getConnectionCount());
- vhost.start();
+ ((AbstractConfiguredObject<?>)vhost).start();
vhost.registerConnection(connection);
assertEquals("unexpected number of connections", 1, vhost.getConnectionCount());
}
@@ -532,12 +533,12 @@ public class VirtualHostTest extends Qpi
return connection;
}
- private VirtualHost<?> createVirtualHost(final String virtualHostName)
+ private QueueManagingVirtualHost<?> createVirtualHost(final String virtualHostName)
{
return createVirtualHost(virtualHostName, Collections.<String, Object>emptyMap());
}
- private VirtualHost<?> createVirtualHost(final String virtualHostName, Map<String,Object> attributes)
+ private QueueManagingVirtualHost<?> createVirtualHost(final String virtualHostName, Map<String,Object> attributes)
{
Map<String, Object> vhAttributes = new HashMap<>();
vhAttributes.put(VirtualHost.NAME, virtualHostName);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java Fri Nov 4 15:15:32 2016
@@ -55,6 +55,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.manager.SimpleAuthenticationManager;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhostnode.TestVirtualHostNode;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -258,9 +259,13 @@ public class BrokerImplTest extends Qpid
long totalAssignedTargetSize = 0;
for(VirtualHostNode<?> vhn : _brokerImpl.getVirtualHostNodes())
{
- long targetSize = vhn.getVirtualHost().getTargetSize();
- assertTrue("A virtualhost's target size cannot be zero", targetSize > 0);
- totalAssignedTargetSize += targetSize;
+ VirtualHost<?> virtualHost = vhn.getVirtualHost();
+ if(virtualHost instanceof QueueManagingVirtualHost)
+ {
+ long targetSize = ((QueueManagingVirtualHost<?>)virtualHost).getTargetSize();
+ assertTrue("A virtualhost's target size cannot be zero", targetSize > 0);
+ totalAssignedTargetSize += targetSize;
+ }
}
long diff = Math.abs(flowToDiskThreshold - totalAssignedTargetSize);
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/AbstractConfiguredObjectTest.java Fri Nov 4 15:15:32 2016
@@ -27,10 +27,10 @@ import java.util.concurrent.atomic.Atomi
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.IllegalStateTransitionException;
-import org.apache.qpid.server.model.NoopConfigurationChangeListener;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -231,7 +231,7 @@ public class AbstractConfiguredObjectTes
final AtomicReference<State> newState = new AtomicReference<>();
final AtomicInteger callCounter = new AtomicInteger();
- parent.addChangeListener(new NoopConfigurationChangeListener()
+ parent.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State old, final State state)
@@ -262,7 +262,7 @@ public class AbstractConfiguredObjectTes
parent.create();
final AtomicInteger callCounter = new AtomicInteger();
- parent.addChangeListener(new NoopConfigurationChangeListener()
+ parent.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void stateChanged(final ConfiguredObject<?> object, final State old, final State state)
@@ -300,7 +300,7 @@ public class AbstractConfiguredObjectTes
configuredObject.create();
final List<ChangeEvent> events = new ArrayList<>();
- configuredObject.addChangeListener(new NoopConfigurationChangeListener()
+ configuredObject.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void attributeSet(ConfiguredObject<?> object, String attributeName, Object oldAttributeValue, Object newAttributeValue)
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/AbstractConfiguredObjectTest.java Fri Nov 4 15:15:32 2016
@@ -34,10 +34,10 @@ import java.util.concurrent.atomic.Atomi
import javax.security.auth.Subject;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.model.AbstractConfigurationChangeListener;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.server.model.NoopConfigurationChangeListener;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
@@ -789,7 +789,7 @@ public class AbstractConfiguredObjectTes
final AtomicInteger listenerCount = new AtomicInteger();
final LinkedHashMap<String, String> updates = new LinkedHashMap<>();
- object.addChangeListener(new NoopConfigurationChangeListener()
+ object.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void attributeSet(final ConfiguredObject<?> object,
@@ -844,7 +844,7 @@ public class AbstractConfiguredObjectTes
final TestSingleton object = _model.getObjectFactory().create(TestSingleton.class, attributes);
final AtomicInteger listenerCount = new AtomicInteger();
- object.addChangeListener(new NoopConfigurationChangeListener()
+ object.addChangeListener(new AbstractConfigurationChangeListener()
{
@Override
public void attributeSet(final ConfiguredObject<?> object,
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1768049&r1=1768048&r2=1768049&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Fri Nov 4 15:15:32 2016
@@ -66,13 +66,14 @@ 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.StateChangeListener;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
abstract class AbstractQueueTestBase extends QpidTestCase
{
private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class);
private Queue<?> _queue;
- private VirtualHost<?> _virtualHost;
+ private QueueManagingVirtualHost<?> _virtualHost;
private String _qname = "qname";
private String _owner = "owner";
private String _routingKey = "routing key";
@@ -1171,7 +1172,7 @@ abstract class AbstractQueueTestBase ext
}
- public VirtualHost<?> getVirtualHost()
+ public QueueManagingVirtualHost<?> getVirtualHost()
{
return _virtualHost;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org