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 2014/02/27 00:27:43 UTC
svn commit: r1572343 [5/7] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/binding/
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java Wed Feb 26 23:27:39 2014
@@ -20,9 +20,9 @@ package org.apache.qpid.server.security;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.consumer.Consumer;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.*;
import org.apache.qpid.server.plugin.AccessControlFactory;
@@ -252,9 +252,9 @@ public class SecurityManager implements
return true;
}
- public void authoriseCreateBinding(Binding binding)
+ public void authoriseCreateBinding(BindingImpl binding)
{
- final Exchange exch = binding.getExchangeImpl();
+ final ExchangeImpl exch = binding.getExchange();
final AMQQueue queue = binding.getAMQQueue();
final String bindingKey = binding.getBindingKey();
@@ -340,7 +340,7 @@ public class SecurityManager implements
}
}
- public void authoriseCreateExchange(final Exchange exchange)
+ public void authoriseCreateExchange(final ExchangeImpl exchange)
{
final String exchangeName = exchange.getName();
if(!checkAllPlugins(new AccessCheck()
@@ -408,7 +408,7 @@ public class SecurityManager implements
}
- public void authoriseUpdate(final Exchange exchange)
+ public void authoriseUpdate(final ExchangeImpl exchange)
{
if(!checkAllPlugins(new AccessCheck()
{
@@ -422,7 +422,7 @@ public class SecurityManager implements
}
}
- public void authoriseDelete(final Exchange exchange)
+ public void authoriseDelete(final ExchangeImpl exchange)
{
if(! checkAllPlugins(new AccessCheck()
{
@@ -519,7 +519,7 @@ public class SecurityManager implements
}
}
- public void authoriseUnbind(final Exchange exch, final String routingKey, final AMQQueue queue)
+ public void authoriseUnbind(final ExchangeImpl exch, final String routingKey, final AMQQueue queue)
{
if(! checkAllPlugins(new AccessCheck()
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java Wed Feb 26 23:27:39 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.queue.AMQQueue;
@@ -155,7 +155,7 @@ public class ObjectProperties
}
- public ObjectProperties(Exchange exch, AMQQueue queue, String routingKey)
+ public ObjectProperties(ExchangeImpl exch, AMQQueue queue, String routingKey)
{
this(queue);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java Wed Feb 26 23:27:39 2014
@@ -29,6 +29,8 @@ import java.util.Map;
import java.util.Set;
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.LifetimePolicy;
@@ -43,7 +45,7 @@ public class DurableConfigurationStoreHe
private static final String QUEUE = Queue.class.getSimpleName();
private static final Set<String> QUEUE_ARGUMENTS_EXCLUDES = new HashSet<String>(Arrays.asList(Queue.ALTERNATE_EXCHANGE));
- public static void updateQueue(DurableConfigurationStore store, AMQQueue<?,?,?> queue)
+ public static void updateQueue(DurableConfigurationStore store, AMQQueue queue)
{
Map<String, Object> attributesMap = new LinkedHashMap<String, Object>();
@@ -65,7 +67,7 @@ public class DurableConfigurationStoreHe
store.update(queue.getId(), QUEUE, attributesMap);
}
- public static void createQueue(DurableConfigurationStore store, AMQQueue<?,?,?> queue)
+ public static void createQueue(DurableConfigurationStore store, AMQQueue<?> queue)
{
Map<String, Object> attributesMap = new HashMap<String, Object>();
if (queue.getAlternateExchange() != null)
@@ -88,7 +90,7 @@ public class DurableConfigurationStoreHe
store.remove(queue.getId(), QUEUE);
}
- public static void createExchange(DurableConfigurationStore store, org.apache.qpid.server.exchange.Exchange exchange)
+ public static void createExchange(DurableConfigurationStore store, ExchangeImpl exchange)
{
Map<String, Object> attributesMap = new HashMap<String, Object>();
attributesMap.put(Exchange.NAME, exchange.getName());
@@ -101,16 +103,16 @@ public class DurableConfigurationStoreHe
}
- public static void removeExchange(DurableConfigurationStore store, org.apache.qpid.server.exchange.Exchange exchange)
+ public static void removeExchange(DurableConfigurationStore store, ExchangeImpl exchange)
{
store.remove(exchange.getId(), EXCHANGE);
}
- public static void createBinding(DurableConfigurationStore store, org.apache.qpid.server.binding.Binding binding)
+ public static void createBinding(DurableConfigurationStore store, BindingImpl binding)
{
Map<String, Object> attributesMap = new HashMap<String, Object>();
attributesMap.put(Binding.NAME, binding.getBindingKey());
- attributesMap.put(Binding.EXCHANGE, binding.getExchangeImpl().getId());
+ attributesMap.put(Binding.EXCHANGE, binding.getExchange().getId());
attributesMap.put(Binding.QUEUE, binding.getAMQQueue().getId());
Map<String, Object> arguments = binding.getArguments();
if (arguments != null)
@@ -122,7 +124,7 @@ public class DurableConfigurationStoreHe
}
- public static void removeBinding(DurableConfigurationStore store, org.apache.qpid.server.binding.Binding binding)
+ public static void removeBinding(DurableConfigurationStore store, BindingImpl binding)
{
store.remove(binding.getId(), BINDING);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Wed Feb 26 23:27:39 2014
@@ -34,8 +34,10 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
-import org.apache.qpid.server.model.ExclusivityPolicy;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.configuration.ExchangeConfiguration;
@@ -45,7 +47,6 @@ import org.apache.qpid.server.connection
import org.apache.qpid.server.connection.IConnectionRegistry;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -54,6 +55,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.MessageNode;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.adapter.VirtualHostAdapter;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.plugin.QpidServiceLoader;
import org.apache.qpid.server.plugin.SystemNodeCreator;
@@ -358,7 +360,7 @@ public abstract class AbstractVirtualHos
attributes.put(org.apache.qpid.server.model.Exchange.LIFETIME_POLICY,
autodelete ? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT);
attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_EXCHANGE, null);
- Exchange newExchange = createExchange(attributes);
+ ExchangeImpl newExchange = createExchange(attributes);
}
catch(ExchangeExistsException e)
{
@@ -381,13 +383,13 @@ public abstract class AbstractVirtualHos
//get the exchange name (returns default exchange name if none was specified)
String exchangeName = queueConfiguration.getExchange();
- Exchange exchange = _exchangeRegistry.getExchange(exchangeName);
+ ExchangeImpl exchange = _exchangeRegistry.getExchange(exchangeName);
if (exchange == null)
{
throw new ConfigurationException("Attempt to bind queue '" + queueName + "' to unknown exchange:" + exchangeName);
}
- Exchange defaultExchange = _exchangeRegistry.getDefaultExchange();
+ ExchangeImpl defaultExchange = _exchangeRegistry.getDefaultExchange();
//get routing keys in configuration (returns empty list if none are defined)
List<?> routingKeys = queueConfiguration.getRoutingKeys();
@@ -418,7 +420,7 @@ public abstract class AbstractVirtualHos
}
- private void configureBinding(AMQQueue queue, Exchange exchange, String routingKey, Map<String,Object> arguments)
+ private void configureBinding(AMQQueue queue, ExchangeImpl exchange, String routingKey, Map<String,Object> arguments)
{
if (_logger.isInfoEnabled())
{
@@ -458,13 +460,13 @@ public abstract class AbstractVirtualHos
_exchangeRegistry.addRegistryChangeListener(new ExchangeRegistry.RegistryChangeListener()
{
@Override
- public void exchangeRegistered(Exchange exchange)
+ public void exchangeRegistered(ExchangeImpl exchange)
{
listener.exchangeRegistered(exchange);
}
@Override
- public void exchangeUnregistered(Exchange exchange)
+ public void exchangeUnregistered(ExchangeImpl exchange)
{
listener.exchangeUnregistered(exchange);
}
@@ -591,37 +593,43 @@ public abstract class AbstractVirtualHos
}
@Override
- public Exchange getExchange(String name)
+ public ExchangeImpl getExchange(String name)
{
return _exchangeRegistry.getExchange(name);
}
@Override
- public Exchange getExchange(UUID id)
+ public ExchangeImpl getExchange(UUID id)
{
return _exchangeRegistry.getExchange(id);
}
@Override
- public Exchange getDefaultExchange()
+ public ExchangeImpl getDefaultExchange()
{
return _exchangeRegistry.getDefaultExchange();
}
@Override
- public Collection<Exchange> getExchanges()
+ public Collection<ExchangeImpl> getExchanges()
{
return Collections.unmodifiableCollection(_exchangeRegistry.getExchanges());
}
@Override
- public Collection<ExchangeType<? extends Exchange>> getExchangeTypes()
+ public Collection<NonDefaultExchange> getExchangesExceptDefault()
+ {
+ return Collections.unmodifiableCollection(_exchangeRegistry.getExchangesExceptDefault());
+ }
+
+ @Override
+ public Collection<ExchangeType<? extends ExchangeImpl>> getExchangeTypes()
{
return _exchangeFactory.getRegisteredTypes();
}
@Override
- public Exchange createExchange(Map<String,Object> attributes)
+ public NonDefaultExchange createExchange(Map<String,Object> attributes)
throws ExchangeExistsException, ReservedExchangeNameException,
UnknownExchangeException, AMQUnknownExchangeType
{
@@ -632,7 +640,7 @@ public abstract class AbstractVirtualHos
synchronized (_exchangeRegistry)
{
- Exchange existing;
+ ExchangeImpl existing;
if((existing = _exchangeRegistry.getExchange(name)) !=null)
{
throw new ExchangeExistsException(name,existing);
@@ -650,7 +658,7 @@ public abstract class AbstractVirtualHos
UUIDGenerator.generateExchangeUUID(name, getName()));
}
- Exchange exchange = _exchangeFactory.createExchange(attributes);
+ NonDefaultExchange exchange = _exchangeFactory.createExchange(attributes);
_exchangeRegistry.registerExchange(exchange);
if(durable)
@@ -662,7 +670,7 @@ public abstract class AbstractVirtualHos
}
@Override
- public void removeExchange(Exchange exchange, boolean force)
+ public void removeExchange(ExchangeImpl exchange, boolean force)
throws ExchangeIsAlternateException, RequiredExchangeException
{
if(exchange.hasReferrers())
@@ -1073,4 +1081,17 @@ public abstract class AbstractVirtualHos
{
return getConfiguration().getMaxDeliveryCount();
}
+
+ @Override
+ public TaskExecutor getTaskExecutor()
+ {
+ // todo - remove this once virtualhost is a configured object itself
+ return _model.getTaskExecutor();
+ }
+
+ @Override
+ public org.apache.qpid.server.model.VirtualHost getModel()
+ {
+ return _model;
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/BindingRecoverer.java Wed Feb 26 23:27:39 2014
@@ -25,16 +25,17 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.store.AbstractDurableConfiguredObjectRecoverer;
import org.apache.qpid.server.store.UnresolvedDependency;
import org.apache.qpid.server.store.UnresolvedObject;
-public class BindingRecoverer extends AbstractDurableConfiguredObjectRecoverer<Binding>
+public class BindingRecoverer extends AbstractDurableConfiguredObjectRecoverer<BindingImpl>
{
private static final Logger _logger = Logger.getLogger(BindingRecoverer.class);
@@ -49,7 +50,7 @@ public class BindingRecoverer extends Ab
}
@Override
- public UnresolvedObject<Binding> createUnresolvedObject(final UUID id,
+ public UnresolvedObject<BindingImpl> createUnresolvedObject(final UUID id,
final String type,
final Map<String, Object> attributes)
{
@@ -62,7 +63,7 @@ public class BindingRecoverer extends Ab
return org.apache.qpid.server.model.Binding.class.getSimpleName();
}
- private class UnresolvedBinding implements UnresolvedObject<Binding>
+ private class UnresolvedBinding implements UnresolvedObject<BindingImpl>
{
private final Map<String, Object> _bindingArgumentsMap;
private final String _bindingName;
@@ -73,7 +74,7 @@ public class BindingRecoverer extends Ab
private List<UnresolvedDependency> _unresolvedDependencies =
new ArrayList<UnresolvedDependency>();
- private Exchange _exchange;
+ private ExchangeImpl _exchange;
private AMQQueue _queue;
public UnresolvedBinding(final UUID id,
@@ -104,16 +105,16 @@ public class BindingRecoverer extends Ab
}
@Override
- public Binding resolve()
+ public BindingImpl resolve()
{
- if(_exchange.getBinding(_bindingName, _queue) == null)
+ if(!_exchange.hasBinding(_bindingName, _queue))
{
_logger.info("Restoring binding: (Exchange: " + _exchange.getName() + ", Queue: " + _queue.getName()
+ ", Routing Key: " + _bindingName + ", Arguments: " + _bindingArgumentsMap + ")");
_exchange.restoreBinding(_bindingId, _bindingName, _queue, _bindingArgumentsMap);
}
- return _exchange.getBinding(_bindingName, _queue);
+ return ((NonDefaultExchange)_exchange).getBinding(_bindingName, _queue);
}
private class QueueDependency implements UnresolvedDependency<AMQQueue>
@@ -140,7 +141,7 @@ public class BindingRecoverer extends Ab
}
- private class ExchangeDependency implements UnresolvedDependency<Exchange>
+ private class ExchangeDependency implements UnresolvedDependency<ExchangeImpl>
{
@Override
@@ -156,7 +157,7 @@ public class BindingRecoverer extends Ab
}
@Override
- public void resolve(final Exchange dependency)
+ public void resolve(final ExchangeImpl dependency)
{
_exchange = dependency;
_unresolvedDependencies.remove(this);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java Wed Feb 26 23:27:39 2014
@@ -19,19 +19,19 @@ package org.apache.qpid.server.virtualho
*
*/
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
public class ExchangeExistsException extends Exception
{
- private final Exchange _existing;
+ private final ExchangeImpl _existing;
- public ExchangeExistsException(String name, Exchange existing)
+ public ExchangeExistsException(String name, ExchangeImpl existing)
{
super(name);
_existing = existing;
}
- public Exchange getExistingExchange()
+ public ExchangeImpl getExistingExchange()
{
return _existing;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeRecoverer.java Wed Feb 26 23:27:39 2014
@@ -24,16 +24,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.store.AbstractDurableConfiguredObjectRecoverer;
import org.apache.qpid.server.store.UnresolvedDependency;
import org.apache.qpid.server.store.UnresolvedObject;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-public class ExchangeRecoverer extends AbstractDurableConfiguredObjectRecoverer<Exchange>
+public class ExchangeRecoverer extends AbstractDurableConfiguredObjectRecoverer<ExchangeImpl>
{
private final ExchangeRegistry _exchangeRegistry;
private final ExchangeFactory _exchangeFactory;
@@ -51,16 +50,16 @@ public class ExchangeRecoverer extends A
}
@Override
- public UnresolvedObject<Exchange> createUnresolvedObject(final UUID id,
+ public UnresolvedObject<ExchangeImpl> createUnresolvedObject(final UUID id,
final String type,
final Map<String, Object> attributes)
{
return new UnresolvedExchange(id, attributes);
}
- private class UnresolvedExchange implements UnresolvedObject<Exchange>
+ private class UnresolvedExchange implements UnresolvedObject<ExchangeImpl>
{
- private Exchange _exchange;
+ private ExchangeImpl _exchange;
public UnresolvedExchange(final UUID id,
final Map<String, Object> attributeMap)
@@ -101,7 +100,7 @@ public class ExchangeRecoverer extends A
}
@Override
- public Exchange resolve()
+ public ExchangeImpl resolve()
{
return _exchange;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueRecoverer.java Wed Feb 26 23:27:39 2014
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.AMQQueue;
@@ -72,7 +72,7 @@ public class QueueRecoverer extends Abst
private final UUID _id;
private AMQQueue _queue;
private List<UnresolvedDependency> _dependencies = new ArrayList<UnresolvedDependency>();
- private Exchange _alternateExchange;
+ private ExchangeImpl _alternateExchange;
public UnresolvedQueue(final UUID id,
final String type,
@@ -136,7 +136,7 @@ public class QueueRecoverer extends Abst
@Override
public void resolve(final Object dependency)
{
- _alternateExchange = (Exchange) dependency;
+ _alternateExchange = (ExchangeImpl) dependency;
_dependencies.remove(this);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Wed Feb 26 23:27:39 2014
@@ -25,15 +25,16 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ScheduledFuture;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.connection.IConnectionRegistry;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.plugin.ExchangeType;
-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.security.SecurityManager;
@@ -61,24 +62,24 @@ public interface VirtualHost extends Dur
AMQQueue createQueue(Map<String, Object> arguments) throws QueueExistsException;
- Exchange createExchange(Map<String,Object> attributes)
+ NonDefaultExchange createExchange(Map<String,Object> attributes)
throws ExchangeExistsException, ReservedExchangeNameException,
UnknownExchangeException, AMQUnknownExchangeType;
- void removeExchange(Exchange exchange, boolean force) throws ExchangeIsAlternateException,
+ void removeExchange(ExchangeImpl exchange, boolean force) throws ExchangeIsAlternateException,
RequiredExchangeException;
MessageDestination getMessageDestination(String name);
- Exchange getExchange(String name);
- Exchange getExchange(UUID id);
+ ExchangeImpl getExchange(String name);
+ ExchangeImpl getExchange(UUID id);
- Exchange getDefaultExchange();
+ ExchangeImpl getDefaultExchange();
- Collection<Exchange> getExchanges();
+ Collection<ExchangeImpl> getExchanges();
- Collection<ExchangeType<? extends Exchange>> getExchangeTypes();
+ Collection<ExchangeType<? extends ExchangeImpl>> getExchangeTypes();
DurableConfigurationStore getDurableConfigurationStore();
@@ -133,4 +134,10 @@ public interface VirtualHost extends Dur
long getDefaultQueueFlowResumeSizeBytes();
int getDefaultMaximumDeliveryAttempts();
+
+ TaskExecutor getTaskExecutor();
+
+ Collection<NonDefaultExchange> getExchangesExceptDefault();
+
+ org.apache.qpid.server.model.VirtualHost getModel();
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostListener.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.virtualhost;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.queue.AMQQueue;
@@ -35,7 +35,7 @@ public interface VirtualHostListener
public void connectionUnregistered(AMQConnectionModel connection);
- public void exchangeRegistered(Exchange exchange);
+ public void exchangeRegistered(ExchangeImpl exchange);
- public void exchangeUnregistered(Exchange exchange);
+ public void exchangeUnregistered(ExchangeImpl exchange);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java Wed Feb 26 23:27:39 2014
@@ -146,15 +146,15 @@ public class VirtualHostConfigurationTes
// Check specifically configured values
AMQQueue aTest = vhost.getQueue("atest");
- assertEquals(4, aTest.getMaximumQueueDepth());
- assertEquals(5, aTest.getMaximumMessageSize());
- assertEquals(6, aTest.getMaximumMessageAge());
+ assertEquals(4, aTest.getAlertThresholdQueueDepthBytes());
+ assertEquals(5, aTest.getAlertThresholdMessageSize());
+ assertEquals(6, aTest.getAlertThresholdMessageAge());
// Check default values
AMQQueue bTest = vhost.getQueue("btest");
- assertEquals(1, bTest.getMaximumQueueDepth());
- assertEquals(2, bTest.getMaximumMessageSize());
- assertEquals(3, bTest.getMaximumMessageAge());
+ assertEquals(1, bTest.getAlertThresholdQueueDepthBytes());
+ assertEquals(2, bTest.getAlertThresholdMessageSize());
+ assertEquals(3, bTest.getAlertThresholdMessageAge());
}
public void testMaxDeliveryCount() throws Exception
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Wed Feb 26 23:27:39 2014
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -60,7 +59,7 @@ public class DefaultExchangeFactoryTest
DefaultExchangeFactory factory = new TestExchangeFactory();
- Collection<ExchangeType<? extends Exchange>> registeredTypes = factory.getRegisteredTypes();
+ Collection<ExchangeType<? extends ExchangeImpl>> registeredTypes = factory.getRegisteredTypes();
assertEquals("Unexpected number of exchange types", _stubbedExchangeTypes.size(), registeredTypes.size());
assertTrue("Direct exchange type is not found", registeredTypes.contains(_directExchangeType));
assertTrue("Fanout exchange type is not found", registeredTypes.contains(_fanoutExchangeType));
@@ -169,7 +168,7 @@ public class DefaultExchangeFactoryTest
public void testCreateDefaultExchangeFactoryWithCustomExchangeType()
{
- ExchangeType<?> customExchangeType = new ExchangeType<Exchange>()
+ ExchangeType<?> customExchangeType = new ExchangeType<NonDefaultExchange>()
{
@Override
public String getType()
@@ -178,7 +177,7 @@ public class DefaultExchangeFactoryTest
}
@Override
- public Exchange newInstance(VirtualHost host, Map<String,Object> attributes)
+ public NonDefaultExchange newInstance(VirtualHost host, Map<String,Object> attributes)
{
return null;
}
@@ -198,7 +197,7 @@ public class DefaultExchangeFactoryTest
DefaultExchangeFactory factory = new TestExchangeFactory();
- Collection<ExchangeType<? extends Exchange>> registeredTypes = factory.getRegisteredTypes();
+ Collection<ExchangeType<? extends ExchangeImpl>> registeredTypes = factory.getRegisteredTypes();
assertEquals("Unexpected number of exchange types", _stubbedExchangeTypes.size(), registeredTypes.size());
assertTrue("Direct exchange type is not found", registeredTypes.contains(_directExchangeType));
assertTrue("Fanout exchange type is not found", registeredTypes.contains(_fanoutExchangeType));
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Wed Feb 26 23:27:39 2014
@@ -142,7 +142,7 @@ public class FanoutExchangeTest extends
assertTrue("Expected queue1 to be routed to", result.contains(queue1));
assertTrue("Expected queue2 to be routed to", result.contains(queue2));
- _exchange.getBinding("key",queue2).delete();
+ _exchange.deleteBinding("key",queue2);
result = _exchange.route(mockMessage(true),InstanceProperties.EMPTY);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java Wed Feb 26 23:27:39 2014
@@ -23,13 +23,12 @@ package org.apache.qpid.server.exchange;
import java.util.Collection;
import junit.framework.TestCase;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.security.*;
import org.apache.qpid.server.virtualhost.VirtualHost;
import java.util.HashMap;
@@ -140,7 +139,7 @@ public class HeadersBindingTest extends
private MockHeader matchHeaders = new MockHeader();
private int _count = 0;
private AMQQueue _queue;
- private Exchange _exchange;
+ private NonDefaultExchange _exchange;
protected void setUp()
{
@@ -150,7 +149,7 @@ public class HeadersBindingTest extends
when(_queue.getVirtualHost()).thenReturn(vhost);
when(vhost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
CurrentActor.set(mock(LogActor.class));
- _exchange = mock(Exchange.class);
+ _exchange = mock(NonDefaultExchange.class);
when(_exchange.getExchangeType()).thenReturn(mock(ExchangeType.class));
}
@@ -165,7 +164,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -176,7 +175,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
matchHeaders.setString("B", "Value of B");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -186,7 +185,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Altered value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertFalse(new HeadersBinding(b).matches(matchHeaders));
}
@@ -197,7 +196,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -209,7 +208,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertFalse(new HeadersBinding(b).matches(matchHeaders));
}
@@ -222,7 +221,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
matchHeaders.setString("B", "Value of B");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -236,7 +235,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("B", "Value of B");
matchHeaders.setString("C", "Value of C");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -250,7 +249,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("B", "Altered value of B");
matchHeaders.setString("C", "Value of C");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertFalse(new HeadersBinding(b).matches(matchHeaders));
}
@@ -261,7 +260,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -273,7 +272,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -286,7 +285,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("A", "Value of A");
matchHeaders.setString("B", "Value of B");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -300,7 +299,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("B", "Value of B");
matchHeaders.setString("C", "Value of C");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -314,7 +313,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("B", "Altered value of B");
matchHeaders.setString("C", "Value of C");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertTrue(new HeadersBinding(b).matches(matchHeaders));
}
@@ -328,7 +327,7 @@ public class HeadersBindingTest extends
matchHeaders.setString("B", "Altered value of B");
matchHeaders.setString("C", "Value of C");
- Binding b = new Binding(null, getQueueName(), _queue, _exchange, bindHeaders);
+ BindingImpl b = new BindingImpl(null, getQueueName(), _queue, _exchange, bindHeaders);
assertFalse(new HeadersBinding(b).matches(matchHeaders));
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Wed Feb 26 23:27:39 2014
@@ -178,7 +178,7 @@ public class HeadersExchangeTest extends
routeAndTest(mockMessage(getArgsMapFromStrings("F0000=Aardvark")), q1, q2);
routeAndTest(mockMessage(getArgsMapFromStrings("F0001")), q3);
- _exchange.getBinding("Q1",q1).delete();
+ _exchange.deleteBinding("Q1",q1);
routeAndTest(mockMessage(getArgsMapFromStrings("F0000")));
routeAndTest(mockMessage(getArgsMapFromStrings("F0000=Aardvark")), q2);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Wed Feb 26 23:27:39 2014
@@ -27,7 +27,7 @@ import java.util.UUID;
import junit.framework.Assert;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
@@ -81,7 +81,7 @@ public class TopicExchangeTest extends Q
}
}
- private AMQQueue<?,?,?> createQueue(String name) throws QueueExistsException
+ private AMQQueue<?> createQueue(String name) throws QueueExistsException
{
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUIDGenerator.generateRandomUUID());
@@ -91,233 +91,233 @@ public class TopicExchangeTest extends Q
public void testNoRoute() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a*#b");
- _exchange.registerQueue(new Binding(null, "a.*.#.b",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a*#b");
+ _exchange.registerQueue(new BindingImpl(null, "a.*.#.b",queue, _exchange, null));
routeMessage("a.b", 0l);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testDirectMatch() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("ab");
- _exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("ab");
+ _exchange.registerQueue(new BindingImpl(null, "a.b",queue, _exchange, null));
routeMessage("a.b",0l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
int queueCount = routeMessage("a.c",1l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testStarMatch() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a*");
- _exchange.registerQueue(new Binding(null, "a.*",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a*");
+ _exchange.registerQueue(new BindingImpl(null, "a.*",queue, _exchange, null));
routeMessage("a.b",0l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.c",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
int queueCount = routeMessage("a",2l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testHashMatch() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a#");
- _exchange.registerQueue(new Binding(null, "a.#",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a#");
+ _exchange.registerQueue(new BindingImpl(null, "a.#",queue, _exchange, null));
routeMessage("a.b.c",0l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.b",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.c",2l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 2l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a",3l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
int queueCount = routeMessage("b", 4l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testMidHash() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a");
- _exchange.registerQueue(new Binding(null, "a.*.#.b",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a");
+ _exchange.registerQueue(new BindingImpl(null, "a.*.#.b",queue, _exchange, null));
routeMessage("a.c.d.b",0l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.c.b",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testMatchAfterHash() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a#");
- _exchange.registerQueue(new Binding(null, "a.*.#.b.c",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a#");
+ _exchange.registerQueue(new BindingImpl(null, "a.*.#.b.c",queue, _exchange, null));
int queueCount = routeMessage("a.c.b.b",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.a.b.c",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
queueCount = routeMessage("a.b.c.b",2l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.b.c.b.c",3l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testHashAfterHash() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a#");
- _exchange.registerQueue(new Binding(null, "a.*.#.b.c.#.d",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a#");
+ _exchange.registerQueue(new BindingImpl(null, "a.*.#.b.c.#.d",queue, _exchange, null));
int queueCount = routeMessage("a.c.b.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.a.b.c.d",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testHashHash() throws Exception
{
- AMQQueue<?,?,?> queue = createQueue("a#");
- _exchange.registerQueue(new Binding(null, "a.#.*.#.d",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a#");
+ _exchange.registerQueue(new BindingImpl(null, "a.#.*.#.d",queue, _exchange, null));
int queueCount = routeMessage("a.c.b.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
routeMessage("a.a.b.c.d",1l);
- Assert.assertEquals(1, queue.getMessageCount());
+ Assert.assertEquals(1, queue.getQueueDepthMessages());
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
queue.clearQueue();
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testSubMatchFails() throws Exception
{
- AMQQueue queue = createQueue("a");
- _exchange.registerQueue(new Binding(null, "a.b.c.d",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a");
+ _exchange.registerQueue(new BindingImpl(null, "a.b.c.d",queue, _exchange, null));
int queueCount = routeMessage("a.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
@@ -340,27 +340,27 @@ public class TopicExchangeTest extends Q
public void testMoreRouting() throws Exception
{
- AMQQueue queue = createQueue("a");
- _exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a");
+ _exchange.registerQueue(new BindingImpl(null, "a.b",queue, _exchange, null));
int queueCount = routeMessage("a.b.c",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
public void testMoreQueue() throws Exception
{
- AMQQueue queue = createQueue("a");
- _exchange.registerQueue(new Binding(null, "a.b",queue, _exchange, null));
+ AMQQueue<?> queue = createQueue("a");
+ _exchange.registerQueue(new BindingImpl(null, "a.b",queue, _exchange, null));
int queueCount = routeMessage("a",0l);
Assert.assertEquals("Message should not route to any queues", 0, queueCount);
- Assert.assertEquals(0, queue.getMessageCount());
+ Assert.assertEquals(0, queue.getQueueDepthMessages());
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.messages;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.util.BrokerTestHelper;
import java.util.List;
@@ -32,7 +32,7 @@ public class ExchangeMessagesTest extend
{
public void testExchangeCreated_Transient() throws Exception
{
- Exchange exchange = BrokerTestHelper.createExchange("test");
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test");
String type = exchange.getTypeName();
String name = exchange.getName();
@@ -47,7 +47,7 @@ public class ExchangeMessagesTest extend
public void testExchangeCreated_Persistent() throws Exception
{
- Exchange exchange = BrokerTestHelper.createExchange("test");
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test");
String type = exchange.getTypeName();
String name = exchange.getName();
@@ -72,7 +72,7 @@ public class ExchangeMessagesTest extend
public void testExchangeDiscardedMessage() throws Exception
{
- Exchange exchange = BrokerTestHelper.createExchange("test");
+ ExchangeImpl exchange = BrokerTestHelper.createExchange("test");
final String name = exchange.getName();
final String routingKey = "routingKey";
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Wed Feb 26 23:27:39 2014
@@ -21,7 +21,7 @@
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.LogSubject;
@@ -178,7 +178,7 @@ public abstract class AbstractTestLogSub
* @param message The message to check
* @param exchange the exchange to check against
*/
- protected void verifyExchange(String message, Exchange exchange)
+ protected void verifyExchange(String message, ExchangeImpl exchange)
{
String exchangeSlice = getSlice("ex", message);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -36,7 +36,7 @@ public class BindingLogSubjectTest exten
private AMQQueue _queue;
private String _routingKey;
- private Exchange _exchange;
+ private ExchangeImpl _exchange;
private VirtualHost _testVhost;
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.logging.subjects;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -30,7 +30,7 @@ import org.apache.qpid.server.virtualhos
*/
public class ExchangeLogSubjectTest extends AbstractTestLogSubject
{
- private Exchange _exchange;
+ private ExchangeImpl _exchange;
private VirtualHost _testVhost;
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Wed Feb 26 23:27:39 2014
@@ -36,7 +36,8 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.QueueConfiguration;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -140,16 +141,16 @@ public class AMQQueueFactoryTest extends
when(_virtualHost.createExchange(attributes.capture())).then(
- new Answer<Exchange>()
+ new Answer<ExchangeImpl>()
{
@Override
- public Exchange answer(InvocationOnMock invocation) throws Throwable
+ public ExchangeImpl answer(InvocationOnMock invocation) throws Throwable
{
Map attributeValues = attributes.getValue();
final String name = MapValueConverter.getStringAttribute(org.apache.qpid.server.model.Exchange.NAME, attributeValues);
final UUID id = MapValueConverter.getUUIDAttribute(org.apache.qpid.server.model.Exchange.ID, attributeValues);
- final Exchange exchange = mock(Exchange.class);
+ final NonDefaultExchange exchange = mock(NonDefaultExchange.class);
ExchangeType exType = mock(ExchangeType.class);
when(exchange.getName()).thenReturn(name);
@@ -260,7 +261,7 @@ public class AMQQueueFactoryTest extends
AMQQueue queue = _queueFactory.createQueue(attributes);
- Exchange altExchange = queue.getAlternateExchange();
+ ExchangeImpl altExchange = queue.getAlternateExchange();
assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getTypeName());
@@ -272,7 +273,7 @@ public class AMQQueueFactoryTest extends
assertNotNull("The DLQ was not registered as expected", dlQueue);
assertTrue("DLQ should have been bound to the alternate exchange", altExchange.isBound(dlQueue));
assertNull("DLQ should have no alternate exchange", dlQueue.getAlternateExchange());
- assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryCount());
+ assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryAttempts());
//2 queues should have been registered
verifyRegisteredQueueCount(2);
@@ -301,8 +302,8 @@ public class AMQQueueFactoryTest extends
AMQQueue queue = _queueFactory.createQueue(attributes);
- assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryCount());
- Exchange altExchange = queue.getAlternateExchange();
+ assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryAttempts());
+ ExchangeImpl altExchange = queue.getAlternateExchange();
assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getTypeName());
@@ -314,7 +315,7 @@ public class AMQQueueFactoryTest extends
assertNotNull("The DLQ was not registered as expected", dlQueue);
assertTrue("DLQ should have been bound to the alternate exchange", altExchange.isBound(dlQueue));
assertNull("DLQ should have no alternate exchange", dlQueue.getAlternateExchange());
- assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryCount());
+ assertEquals("DLQ should have a zero maximum delivery count", 0, dlQueue.getMaximumDeliveryAttempts());
//2 queues should have been registered
verifyRegisteredQueueCount(2);
@@ -403,7 +404,7 @@ public class AMQQueueFactoryTest extends
final AMQQueue queue = _queueFactory.createQueue(attributes);
assertNotNull("The queue was not registered as expected ", queue);
- assertEquals("Maximum delivery count not as expected", 5, queue.getMaximumDeliveryCount());
+ assertEquals("Maximum delivery count not as expected", 5, queue.getMaximumDeliveryAttempts());
verifyRegisteredQueueCount(1);
}
@@ -421,7 +422,7 @@ public class AMQQueueFactoryTest extends
final AMQQueue queue = _queueFactory.createQueue(attributes);
assertNotNull("The queue was not registered as expected ", queue);
- assertEquals("Maximum delivery count not as expected", 0, queue.getMaximumDeliveryCount());
+ assertEquals("Maximum delivery count not as expected", 0, queue.getMaximumDeliveryAttempts());
verifyRegisteredQueueCount(1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org