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 [7/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-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Wed Feb 26 23:27:39 2014
@@ -27,13 +27,11 @@ import java.util.LinkedHashMap;
import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.binding.*;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.exchange.AMQUnknownExchangeType;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.HeadersExchange;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.FilterManager;
@@ -688,7 +686,7 @@ public class ServerSessionDelegate exten
if(method.getPassive())
{
- Exchange exchange = getExchange(session, exchangeName);
+ ExchangeImpl exchange = getExchange(session, exchangeName);
if(exchange == null)
{
@@ -736,7 +734,7 @@ public class ServerSessionDelegate exten
}
catch(ExchangeExistsException e)
{
- Exchange exchange = e.getExistingExchange();
+ ExchangeImpl exchange = e.getExistingExchange();
if(!exchange.getTypeName().equals(method.getType()))
{
exception(session, method, ExecutionErrorCode.NOT_ALLOWED,
@@ -776,7 +774,7 @@ public class ServerSessionDelegate exten
((ServerSession)session).close(errorCode.getValue(), description);
}
- private Exchange getExchange(Session session, String exchangeName)
+ private ExchangeImpl getExchange(Session session, String exchangeName)
{
return getVirtualHost(session).getExchange(exchangeName);
}
@@ -827,7 +825,7 @@ public class ServerSessionDelegate exten
return;
}
- Exchange exchange = getExchange(session, method.getExchange());
+ ExchangeImpl exchange = getExchange(session, method.getExchange());
if(exchange == null)
{
@@ -862,7 +860,7 @@ public class ServerSessionDelegate exten
return false;
}
- private boolean isStandardExchange(Exchange exchange, Collection<ExchangeType<? extends Exchange>> registeredTypes)
+ private boolean isStandardExchange(ExchangeImpl exchange, Collection<ExchangeType<? extends ExchangeImpl>> registeredTypes)
{
for(ExchangeType type : registeredTypes)
{
@@ -880,7 +878,7 @@ public class ServerSessionDelegate exten
ExchangeQueryResult result = new ExchangeQueryResult();
- Exchange exchange = getExchange(session, method.getName());
+ ExchangeImpl exchange = getExchange(session, method.getName());
if(exchange != null)
{
@@ -919,7 +917,7 @@ public class ServerSessionDelegate exten
method.setBindingKey(method.getQueue());
}
AMQQueue queue = virtualHost.getQueue(method.getQueue());
- Exchange exchange = virtualHost.getExchange(method.getExchange());
+ ExchangeImpl exchange = virtualHost.getExchange(method.getExchange());
if(queue == null)
{
exception(session, method, ExecutionErrorCode.NOT_FOUND, "Queue: '" + method.getQueue() + "' not found");
@@ -978,7 +976,7 @@ public class ServerSessionDelegate exten
else
{
AMQQueue queue = virtualHost.getQueue(method.getQueue());
- Exchange exchange = virtualHost.getExchange(method.getExchange());
+ ExchangeImpl exchange = virtualHost.getExchange(method.getExchange());
if(queue == null)
{
exception(session, method, ExecutionErrorCode.NOT_FOUND, "Queue: '" + method.getQueue() + "' not found");
@@ -991,10 +989,9 @@ public class ServerSessionDelegate exten
{
try
{
- Binding binding = exchange.getBinding(method.getBindingKey(), queue);
- if(binding != null)
+ if(exchange.hasBinding(method.getBindingKey(), queue))
{
- binding.delete();
+ exchange.deleteBinding(method.getBindingKey(), queue);
}
}
catch (AccessControlException e)
@@ -1011,7 +1008,7 @@ public class ServerSessionDelegate exten
ExchangeBoundResult result = new ExchangeBoundResult();
VirtualHost virtualHost = getVirtualHost(session);
- Exchange exchange;
+ ExchangeImpl exchange;
AMQQueue queue;
if(method.hasExchange())
{
@@ -1378,7 +1375,7 @@ public class ServerSessionDelegate exten
arguments.put(attrName, queue.getAttribute(attrName));
}
result.setArguments(QueueArgumentsConverter.convertModelArgsToWire(arguments));
- result.setMessageCount(queue.getMessageCount());
+ result.setMessageCount(queue.getQueueDepthMessages());
result.setSubscriberCount(queue.getConsumerCount());
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Wed Feb 26 23:27:39 2014
@@ -32,6 +32,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQConnectionException;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.connection.SessionPrincipal;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.filter.MessageFilter;
@@ -48,7 +49,6 @@ import org.apache.qpid.protocol.AMQConst
import org.apache.qpid.server.TransactionTimeoutHelper;
import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction;
import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.FilterManagerFactory;
import org.apache.qpid.server.filter.SimpleFilterManager;
@@ -1267,14 +1267,14 @@ public class AMQChannel<T extends AMQPro
}
- private class ImmediateAction<C extends Consumer> implements Action<MessageInstance<?,C>>
+ private class ImmediateAction implements Action<MessageInstance>
{
public ImmediateAction()
{
}
- public void performAction(MessageInstance<?,C> entry)
+ public void performAction(MessageInstance entry)
{
TransactionLogResource queue = entry.getOwningResource();
@@ -1332,10 +1332,10 @@ public class AMQChannel<T extends AMQPro
}
}
- private final class CapacityCheckAction<C extends Consumer> implements Action<MessageInstance<?,C>>
+ private final class CapacityCheckAction implements Action<MessageInstance>
{
@Override
- public void performAction(final MessageInstance<?,C> entry)
+ public void performAction(final MessageInstance entry)
{
TransactionLogResource queue = entry.getOwningResource();
if(queue instanceof CapacityChecker)
@@ -1569,7 +1569,7 @@ public class AMQChannel<T extends AMQPro
{
final AMQQueue queue = (AMQQueue) owningResource;
- final Exchange altExchange = queue.getAlternateExchange();
+ final ExchangeImpl altExchange = queue.getAlternateExchange();
if (altExchange == null)
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicGetMethodHandler.java Wed Feb 26 23:27:39 2014
@@ -210,7 +210,7 @@ public class BasicGetMethodHandler imple
props,
_channel.getChannelId(),
deliveryTag,
- _queue.getMessageCount());
+ _queue.getQueueDepthMessages());
_deliveredMessage = true;
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeBoundHandler.java Wed Feb 26 23:27:39 2014
@@ -25,8 +25,8 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.framing.ExchangeBoundBody;
import org.apache.qpid.framing.ExchangeBoundOkBody;
import org.apache.qpid.framing.MethodRegistry;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
@@ -82,7 +82,7 @@ public class ExchangeBoundHandler implem
AMQShortString exchangeName = body.getExchange() == null ? AMQShortString.EMPTY_STRING : body.getExchange();
AMQShortString queueName = body.getQueue();
AMQShortString routingKey = body.getRoutingKey();
- Exchange exchange = virtualHost.getExchange(exchangeName.toString());
+ ExchangeImpl exchange = virtualHost.getExchange(exchangeName.toString());
ExchangeBoundOkBody response;
if (exchange == null)
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeclareHandler.java Wed Feb 26 23:27:39 2014
@@ -30,13 +30,12 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.framing.ExchangeDeclareBody;
import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.UnknownExchangeException;
@@ -77,7 +76,7 @@ public class ExchangeDeclareHandler impl
_logger.debug("Request to declare exchange of type " + body.getType() + " with name " + exchangeName);
}
- Exchange exchange;
+ ExchangeImpl exchange;
if (body.getPassive())
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ExchangeDeleteHandler.java Wed Feb 26 23:27:39 2014
@@ -24,8 +24,8 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.framing.ExchangeDeleteBody;
import org.apache.qpid.framing.ExchangeDeleteOkBody;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
@@ -62,7 +62,7 @@ public class ExchangeDeleteHandler imple
{
final String exchangeName = body.getExchange() == null ? null : body.getExchange().toString();
- final Exchange exchange = virtualHost.getExchange(exchangeName);
+ final ExchangeImpl exchange = virtualHost.getExchange(exchangeName);
if(exchange == null)
{
throw body.getChannelException(AMQConstant.NOT_FOUND, "No such exchange: " + body.getExchange());
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java Wed Feb 26 23:27:39 2014
@@ -29,10 +29,9 @@ import org.apache.qpid.framing.FieldTabl
import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.framing.QueueBindBody;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
@@ -103,7 +102,7 @@ public class QueueBindHandler implements
throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + queueName + " does not exist.");
}
final String exchangeName = body.getExchange() == null ? null : body.getExchange().toString();
- final Exchange exch = virtualHost.getExchange(exchangeName);
+ final ExchangeImpl exch = virtualHost.getExchange(exchangeName);
if (exch == null)
{
throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + exchangeName + " does not exist.");
@@ -121,13 +120,7 @@ public class QueueBindHandler implements
if(!exch.addBinding(bindingKey, queue, arguments) && TopicExchange.TYPE.equals(exch.getExchangeType()))
{
- Binding oldBinding = exch.getBinding(bindingKey, queue);
-
- Map<String, Object> oldArgs = oldBinding.getArguments();
- if((oldArgs == null && !arguments.isEmpty()) || (oldArgs != null && !oldArgs.equals(arguments)))
- {
- exch.replaceBinding(oldBinding.getId(), bindingKey, queue, arguments);
- }
+ exch.replaceBinding(bindingKey, queue, arguments);
}
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueDeclareHandler.java Wed Feb 26 23:27:39 2014
@@ -163,7 +163,7 @@ public class QueueDeclareHandler impleme
MethodRegistry methodRegistry = protocolConnection.getMethodRegistry();
QueueDeclareOkBody responseBody =
methodRegistry.createQueueDeclareOkBody(queueName,
- queue.getMessageCount(),
+ queue.getQueueDepthMessages(),
queue.getConsumerCount());
protocolConnection.writeFrame(responseBody.generateFrame(channelId));
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java Wed Feb 26 23:27:39 2014
@@ -30,9 +30,8 @@ import org.apache.qpid.framing.QueueUnbi
import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.protocol.v0_8.state.AMQStateManager;
@@ -94,13 +93,13 @@ public class QueueUnbindHandler implemen
{
throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.getQueue() + " does not exist.");
}
- final Exchange exch = virtualHost.getExchange(body.getExchange() == null ? null : body.getExchange().toString());
+ final ExchangeImpl exch = virtualHost.getExchange(body.getExchange() == null ? null : body.getExchange().toString());
if (exch == null)
{
throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + body.getExchange() + " does not exist.");
}
- if(exch.getBinding(String.valueOf(routingKey), queue) == null)
+ if(!exch.hasBinding(String.valueOf(routingKey), queue))
{
throw body.getChannelException(AMQConstant.NOT_FOUND,"No such binding");
}
@@ -108,11 +107,7 @@ public class QueueUnbindHandler implemen
{
try
{
- Binding binding = exch.getBinding(String.valueOf(routingKey), queue);
- if(binding != null)
- {
- binding.delete();
- }
+ exch.deleteBinding(String.valueOf(routingKey), queue);
}
catch (AccessControlException e)
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Wed Feb 26 23:27:39 2014
@@ -26,13 +26,12 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.message.MessageContentSource;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.util.BrokerTestHelper;
@@ -100,7 +99,7 @@ public class AMQChannelTest extends Qpid
channel.setLocalTransactional();
MessagePublishInfo info = mock(MessagePublishInfo.class);
- Exchange e = mock(Exchange.class);
+ ExchangeImpl e = mock(ExchangeImpl.class);
ContentHeaderBody contentHeaderBody= mock(ContentHeaderBody.class);
BasicContentHeaderProperties properties = mock(BasicContentHeaderProperties.class);
@@ -123,7 +122,7 @@ public class AMQChannelTest extends Qpid
channel.setLocalTransactional();
MessagePublishInfo info = mock(MessagePublishInfo.class);
- Exchange e = mock(Exchange.class);
+ ExchangeImpl e = mock(ExchangeImpl.class);
ContentHeaderBody contentHeaderBody= mock(ContentHeaderBody.class);
BasicContentHeaderProperties properties = mock(BasicContentHeaderProperties.class);
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java Wed Feb 26 23:27:39 2014
@@ -25,7 +25,7 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-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;
@@ -73,7 +73,7 @@ public class BrokerTestHelper_0_8 extend
when(info.getExchange()).thenReturn(exchangeNameAsShortString);
when(info.getRoutingKey()).thenReturn(routingKey);
- Exchange exchange = channel.getVirtualHost().getExchange(exchangeName);
+ ExchangeImpl exchange = channel.getVirtualHost().getExchange(exchangeName);
for (int count = 0; count < numberOfMessages; count++)
{
channel.setPublishFrame(info, exchange);
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java Wed Feb 26 23:27:39 2014
@@ -75,7 +75,7 @@ public class ExtractResendAndRequeueTest
when(_queue.getName()).thenReturn(getName());
when(_queue.isDeleted()).thenReturn(_queueDeleted);
_consumer = mock(Consumer.class);
- when(_consumer.getId()).thenReturn(Consumer.SUB_ID_GENERATOR.getAndIncrement());
+ when(_consumer.getConsumerNumber()).thenReturn(Consumer.CONSUMER_NUMBER_GENERATOR.getAndIncrement());
long id = 0;
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java Wed Feb 26 23:27:39 2014
@@ -25,7 +25,7 @@ import org.apache.qpid.amqp_1_0.type.mes
import org.apache.qpid.amqp_1_0.type.messaging.Rejected;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusExpiryPolicy;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -35,11 +35,11 @@ public class ExchangeDestination impleme
public static final Rejected REJECTED = new Rejected();
private static final Outcome[] OUTCOMES = { ACCEPTED, REJECTED};
- private Exchange _exchange;
+ private ExchangeImpl _exchange;
private TerminusDurability _durability;
private TerminusExpiryPolicy _expiryPolicy;
- public ExchangeDestination(Exchange exchange, TerminusDurability durable, TerminusExpiryPolicy expiryPolicy)
+ public ExchangeDestination(ExchangeImpl exchange, TerminusDurability durable, TerminusExpiryPolicy expiryPolicy)
{
_exchange = exchange;
_durability = durable;
@@ -98,7 +98,7 @@ public class ExchangeDestination impleme
return 20000;
}
- public Exchange getExchange()
+ public ExchangeImpl getExchange()
{
return _exchange;
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NodeReceivingDestination.java Wed Feb 26 23:27:39 2014
@@ -25,7 +25,6 @@ import org.apache.qpid.amqp_1_0.type.mes
import org.apache.qpid.amqp_1_0.type.messaging.Rejected;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
import org.apache.qpid.amqp_1_0.type.messaging.TerminusExpiryPolicy;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.txn.ServerTransaction;
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Wed Feb 26 23:27:39 2014
@@ -21,16 +21,12 @@
package org.apache.qpid.server.protocol.v1_0;
import java.security.AccessControlException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
@@ -51,9 +47,7 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.amqp_1_0.type.transport.Transfer;
import org.apache.qpid.filter.SelectorParsingException;
import org.apache.qpid.filter.selector.ParseException;
-import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.server.filter.SimpleFilterManager;
@@ -205,7 +199,7 @@ public class SendingLink_1_0 implements
}
AMQQueue queue = _vhost.getQueue(name);
- Exchange exchange = exchangeDestination.getExchange();
+ ExchangeImpl exchange = exchangeDestination.getExchange();
if(queue == null)
{
@@ -220,17 +214,16 @@ public class SendingLink_1_0 implements
}
else
{
- List<Binding> bindings = queue.getBindings();
- List<Binding> bindingsToRemove = new ArrayList<Binding>();
- for(Binding existingBinding : bindings)
+ Collection<BindingImpl> bindings = queue.getBindings();
+ List<BindingImpl> bindingsToRemove = new ArrayList<BindingImpl>();
+ for(BindingImpl existingBinding : bindings)
{
- if(existingBinding.getExchangeImpl() != _vhost.getDefaultExchange()
- && existingBinding.getExchangeImpl() != exchange)
+ if(existingBinding.getExchange() != exchange)
{
bindingsToRemove.add(existingBinding);
}
}
- for(Binding existingBinding : bindingsToRemove)
+ for(BindingImpl existingBinding : bindingsToRemove)
{
existingBinding.delete();
}
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Wed Feb 26 23:27:39 2014
@@ -43,9 +43,9 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.server.connection.SessionPrincipal;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.*;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
@@ -138,7 +138,7 @@ public class Session_1_0 implements Sess
}
else
{
- Exchange exchg = getVirtualHost().getExchange(addr);
+ ExchangeImpl exchg = getVirtualHost().getExchange(addr);
if(exchg != null)
{
destination = new ExchangeDestination(exchg, source.getDurable(), source.getExpiryPolicy());
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java Wed Feb 26 23:27:39 2014
@@ -30,7 +30,7 @@ import org.apache.qpid.framing.BasicCont
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.protocol.v0_10.MessageTransferMessage;
import org.apache.qpid.server.protocol.v0_8.AMQMessage;
@@ -110,7 +110,7 @@ public class MessageConverter_0_10_to_0_
exchangeName = "";
}
- Exchange exchange = vhost.getExchange(exchangeName);
+ ExchangeImpl exchange = vhost.getExchange(exchangeName);
String exchangeClass = exchange == null
? ExchangeDefaults.DIRECT_EXCHANGE_CLASS
: exchange.getTypeName();
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Wed Feb 26 23:27:39 2014
@@ -56,7 +56,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-class ManagementNode implements MessageSource<ManagementNodeConsumer,ManagementNode>, MessageDestination
+class ManagementNode implements MessageSource, MessageDestination
{
public static final String NAME_ATTRIBUTE = "name";
@@ -93,8 +93,8 @@ class ManagementNode implements MessageS
private final UUID _id;
- private final CopyOnWriteArrayList<ConsumerRegistrationListener<ManagementNode>> _consumerRegistrationListeners =
- new CopyOnWriteArrayList<ConsumerRegistrationListener<ManagementNode>>();
+ private final CopyOnWriteArrayList<ConsumerRegistrationListener<? super MessageSource>> _consumerRegistrationListeners =
+ new CopyOnWriteArrayList<ConsumerRegistrationListener<? super MessageSource>>();
private final SystemNodeCreator.SystemNodeRegistry _registry;
private final ConfiguredObject<?> _managedObject;
@@ -139,18 +139,41 @@ class ManagementNode implements MessageS
private Class getManagementClass(Class objectClass)
{
- List<Class> allClasses = new ArrayList<Class>();
- allClasses.add(objectClass);
- allClasses.addAll(Arrays.asList(objectClass.getInterfaces()));
- allClasses.add(objectClass.getSuperclass());
- for(Class clazz : allClasses)
+
+ if(objectClass.getAnnotation(ManagedObject.class)!=null)
{
- ManagedObject annotation = (ManagedObject) clazz.getAnnotation(ManagedObject.class);
- if(annotation != null)
+ return objectClass;
+ }
+ List<Class> allClasses = Collections.singletonList(objectClass);
+ List<Class> testedClasses = new ArrayList<Class>();
+ do
+ {
+ testedClasses.addAll( allClasses );
+ allClasses = new ArrayList<Class>();
+ for(Class c : testedClasses)
{
- return clazz;
+ for(Class i : c.getInterfaces())
+ {
+ if(!allClasses.contains(i))
+ {
+ allClasses.add(i);
+ }
+ }
+ if(c.getSuperclass() != null && !allClasses.contains(c.getSuperclass()))
+ {
+ allClasses.add(c.getSuperclass());
+ }
+ }
+ allClasses.removeAll(testedClasses);
+ for(Class c : allClasses)
+ {
+ if(c.getAnnotation(ManagedObject.class) != null)
+ {
+ return c;
+ }
}
}
+ while(!allClasses.isEmpty());
return null;
}
@@ -240,7 +263,7 @@ class ManagementNode implements MessageS
public <M extends ServerMessage<? extends StorableMessageMetaData>> int send(final M message,
final InstanceProperties instanceProperties,
final ServerTransaction txn,
- final Action<? super MessageInstance<?, ? extends Consumer>> postEnqueueAction)
+ final Action<? super MessageInstance> postEnqueueAction)
{
@SuppressWarnings("unchecked")
@@ -286,7 +309,7 @@ class ManagementNode implements MessageS
return header.containsHeader(name) && header.getHeader(name) instanceof String;
}
- synchronized void enqueue(InternalMessage message, InstanceProperties properties, Action<? super MessageInstance<?, ? extends Consumer>> postEnqueueAction)
+ synchronized void enqueue(InternalMessage message, InstanceProperties properties, Action<? super MessageInstance> postEnqueueAction)
{
if(postEnqueueAction != null)
{
@@ -925,7 +948,7 @@ class ManagementNode implements MessageS
}
@Override
- public synchronized <T extends ConsumerTarget> ManagementNodeConsumer addConsumer(final T target,
+ public synchronized ManagementNodeConsumer addConsumer(final ConsumerTarget target,
final FilterManager filters,
final Class<? extends ServerMessage> messageClass,
final String consumerName,
@@ -935,7 +958,7 @@ class ManagementNode implements MessageS
final ManagementNodeConsumer managementNodeConsumer = new ManagementNodeConsumer(consumerName,this, target);
target.consumerAdded(managementNodeConsumer);
_consumers.put(consumerName, managementNodeConsumer);
- for(ConsumerRegistrationListener<ManagementNode> listener : _consumerRegistrationListeners)
+ for(ConsumerRegistrationListener<? super MessageSource> listener : _consumerRegistrationListeners)
{
listener.consumerAdded(this, managementNodeConsumer);
}
@@ -949,7 +972,7 @@ class ManagementNode implements MessageS
}
@Override
- public void addConsumerRegistrationListener(final ConsumerRegistrationListener<ManagementNode> listener)
+ public void addConsumerRegistrationListener(final ConsumerRegistrationListener<? super MessageSource> listener)
{
_consumerRegistrationListeners.add(listener);
}
@@ -984,7 +1007,7 @@ class ManagementNode implements MessageS
return false;
}
- private class ConsumedMessageInstance implements MessageInstance<ConsumedMessageInstance,Consumer>
+ private class ConsumedMessageInstance implements MessageInstance
{
private final ServerMessage _message;
private final InstanceProperties _properties;
@@ -1015,13 +1038,13 @@ class ManagementNode implements MessageS
}
@Override
- public void addStateChangeListener(final StateChangeListener<? super ConsumedMessageInstance, State> listener)
+ public void addStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
}
@Override
- public boolean removeStateChangeListener(final StateChangeListener<? super ConsumedMessageInstance, State> listener)
+ public boolean removeStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
return false;
}
@@ -1094,7 +1117,7 @@ class ManagementNode implements MessageS
}
@Override
- public int routeToAlternate(final Action<? super MessageInstance<?, ? extends Consumer>> action,
+ public int routeToAlternate(final Action<? super MessageInstance> action,
final ServerTransaction txn)
{
return 0;
@@ -1182,7 +1205,8 @@ class ManagementNode implements MessageS
@Override
public void childAdded(final ConfiguredObject object, final ConfiguredObject child)
{
- final ManagedEntityType entityType = _entityTypes.get(getManagementClass(child.getClass()).getName());
+ final Class managementClass = getManagementClass(child.getClass());
+ final ManagedEntityType entityType = _entityTypes.get(managementClass.getName());
if(entityType != null)
{
_entities.get(entityType).put(child.getName(), child);
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java Wed Feb 26 23:27:39 2014
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.Reentr
class ManagementNodeConsumer implements Consumer
{
- private final long _id = Consumer.SUB_ID_GENERATOR.getAndIncrement();
+ private final long _id = Consumer.CONSUMER_NUMBER_GENERATOR.getAndIncrement();
private final ManagementNode _managementNode;
private final List<ManagementResponse> _queue = Collections.synchronizedList(new ArrayList<ManagementResponse>());
private final ConsumerTarget _target;
@@ -95,7 +95,7 @@ class ManagementNodeConsumer implements
}
@Override
- public long getId()
+ public long getConsumerNumber()
{
return _id;
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementResponse.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,7 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.StateChangeListener;
-class ManagementResponse implements MessageInstance<ManagementResponse,ManagementNodeConsumer>
+class ManagementResponse implements MessageInstance
{
private final ManagementNodeConsumer _consumer;
private int _deliveryCount;
@@ -65,13 +65,13 @@ class ManagementResponse implements Mess
}
@Override
- public void addStateChangeListener(final StateChangeListener<? super ManagementResponse, State> listener)
+ public void addStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
}
@Override
- public boolean removeStateChangeListener(final StateChangeListener<? super ManagementResponse, State> listener)
+ public boolean removeStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
return false;
}
@@ -84,7 +84,7 @@ class ManagementResponse implements Mess
}
@Override
- public boolean isAcquiredBy(final ManagementNodeConsumer consumer)
+ public boolean isAcquiredBy(final Consumer consumer)
{
return consumer == _consumer && !isDeleted();
}
@@ -114,7 +114,7 @@ class ManagementResponse implements Mess
}
@Override
- public boolean isRejectedBy(final ManagementNodeConsumer consumer)
+ public boolean isRejectedBy(final Consumer consumer)
{
return false;
}
@@ -132,7 +132,7 @@ class ManagementResponse implements Mess
}
@Override
- public boolean acquire(final ManagementNodeConsumer sub)
+ public boolean acquire(final Consumer sub)
{
return false;
}
@@ -144,7 +144,7 @@ class ManagementResponse implements Mess
}
@Override
- public int routeToAlternate(final Action<? super MessageInstance<?, ? extends Consumer>> action,
+ public int routeToAlternate(final Action<? super MessageInstance> action,
final ServerTransaction txn)
{
return 0;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Wed Feb 26 23:27:39 2014
@@ -328,7 +328,7 @@ public class MessageServlet extends Abst
? "Acquired"
: "");
final Consumer deliveredConsumer = entry.getDeliveredConsumer();
- object.put("deliveredTo", deliveredConsumer == null ? null : deliveredConsumer.getId());
+ object.put("deliveredTo", deliveredConsumer == null ? null : deliveredConsumer.getConsumerNumber());
ServerMessage message = entry.getMessage();
if(message != null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java Wed Feb 26 23:27:39 2014
@@ -22,6 +22,8 @@
package org.apache.qpid.server.jmx.mbeans;
import org.apache.qpid.management.common.mbeans.ManagedExchange;
+import org.apache.qpid.server.binding.BindingImpl;
+import org.apache.qpid.server.exchange.HeadersExchange;
import org.apache.qpid.server.jmx.AMQManagedObject;
import org.apache.qpid.server.jmx.ManagedObject;
import org.apache.qpid.server.model.Binding;
@@ -173,7 +175,7 @@ public class ExchangeMBean extends AMQMa
{
if(HEADERS_EXCHANGE_TYPE.equals(_exchange.getType()))
{
- return getHeadersBindings(_exchange.getBindings());
+ return getHeadersBindings(_exchange.getBindings());
}
else
{
@@ -181,7 +183,7 @@ public class ExchangeMBean extends AMQMa
}
}
- private TabularData getHeadersBindings(Collection<Binding> bindings) throws OpenDataException
+ private TabularData getHeadersBindings(Collection<? extends Binding> bindings) throws OpenDataException
{
TabularType bindinglistDataType =
new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
@@ -221,7 +223,7 @@ public class ExchangeMBean extends AMQMa
}
- private TabularData getNonHeadersBindings(Collection<Binding> bindings) throws OpenDataException
+ private TabularData getNonHeadersBindings(Collection<? extends Binding> bindings) throws OpenDataException
{
TabularType bindinglistDataType =
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Wed Feb 26 23:27:39 2014
@@ -166,7 +166,7 @@ public class VirtualHostManagerMBean ext
try
{
getConfiguredObject().createExchange(name, State.ACTIVE, durable,
- LifetimePolicy.PERMANENT, 0l, type, Collections.EMPTY_MAP);
+ LifetimePolicy.PERMANENT, type, Collections.EMPTY_MAP);
}
catch (IllegalArgumentException iae)
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java Wed Feb 26 23:27:39 2014
@@ -87,7 +87,7 @@ public class QueueMBeanTest extends Qpid
public void testGetMessageCount() throws Exception
{
- when(_mockQueue.getQueueDepthMessages()).thenReturn(1000l);
+ when(_mockQueue.getQueueDepthMessages()).thenReturn(1000);
assertStatistic("messageCount", 1000);
}
@@ -105,13 +105,13 @@ public class QueueMBeanTest extends Qpid
public void testActiveConsumerCount() throws Exception
{
- when(_mockQueue.getConsumerCountWithCredit()).thenReturn(3l);
+ when(_mockQueue.getConsumerCountWithCredit()).thenReturn(3);
assertStatistic("activeConsumerCount", 3);
}
public void testConsumerCount() throws Exception
{
- when(_mockQueue.getConsumerCount()).thenReturn(3l);
+ when(_mockQueue.getConsumerCount()).thenReturn(3);
assertStatistic("consumerCount", 3);
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java Wed Feb 26 23:27:39 2014
@@ -146,7 +146,7 @@ public class VirtualHostManagerMBeanTest
public void testCreateNewDurableExchange() throws Exception
{
_virtualHostManagerMBean.createNewExchange(TEST_EXCHANGE_NAME, TEST_EXCHANGE_TYPE, true);
- verify(_mockVirtualHost).createExchange(TEST_EXCHANGE_NAME, State.ACTIVE, true, LifetimePolicy.PERMANENT, 0, TEST_EXCHANGE_TYPE, EMPTY_ARGUMENT_MAP);
+ verify(_mockVirtualHost).createExchange(TEST_EXCHANGE_NAME, State.ACTIVE, true, LifetimePolicy.PERMANENT, TEST_EXCHANGE_TYPE, EMPTY_ARGUMENT_MAP);
}
public void testCreateNewExchangeWithUnknownExchangeType() throws Exception
@@ -161,7 +161,7 @@ public class VirtualHostManagerMBeanTest
{
// PASS
}
- verify(_mockVirtualHost, never()).createExchange(TEST_EXCHANGE_NAME, State.ACTIVE, true, LifetimePolicy.PERMANENT, 0, exchangeType, EMPTY_ARGUMENT_MAP);
+ verify(_mockVirtualHost, never()).createExchange(TEST_EXCHANGE_NAME, State.ACTIVE, true, LifetimePolicy.PERMANENT, exchangeType, EMPTY_ARGUMENT_MAP);
}
public void testUnregisterExchange() throws Exception
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Wed Feb 26 23:27:39 2014
@@ -1187,7 +1187,10 @@ public class AMQSession_0_10 extends AMQ
for (String key: source.keySet())
{
match = target.containsKey(key) &&
- target.get(key).equals(source.get(key));
+ (target.get(key).equals(source.get(key))
+ || (target.get(key) instanceof Number)
+ && source.get(key) instanceof Number &&
+ (((Number) target.get(key)).longValue()) == (((Number) source.get(key)).longValue()));
if (!match)
{
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java Wed Feb 26 23:27:39 2014
@@ -34,13 +34,14 @@ import org.apache.qpid.framing.ContentHe
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
@@ -212,15 +213,15 @@ public class MessageStoreTest extends Qp
createAllTopicQueues();
//Register Non-Durable DirectExchange
- Exchange nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false);
+ ExchangeImpl nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false);
bindAllQueuesToExchange(nonDurableExchange, directRouting);
//Register DirectExchange
- Exchange directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true);
+ ExchangeImpl directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true);
bindAllQueuesToExchange(directExchange, directRouting);
//Register TopicExchange
- Exchange topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true);
+ ExchangeImpl topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true);
bindAllTopicQueuesToExchange(topicExchange, topicRouting);
//Send Message To NonDurable direct Exchange = persistent
@@ -365,7 +366,7 @@ public class MessageStoreTest extends Qp
{
int origExchangeCount = getVirtualHost().getExchanges().size();
- Map<String, Exchange> oldExchanges = createExchanges();
+ Map<String, ExchangeImpl> oldExchanges = createExchanges();
assertEquals("Incorrect number of exchanges registered before recovery",
origExchangeCount + 3, getVirtualHost().getExchanges().size());
@@ -396,7 +397,7 @@ public class MessageStoreTest extends Qp
origExchangeCount + 1, getVirtualHost().getExchanges().size());
//test that removing the exchange means it is not recovered next time
- final Exchange exchange = getVirtualHost().getExchange(directExchangeName);
+ final ExchangeImpl exchange = getVirtualHost().getExchange(directExchangeName);
DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange);
reloadVirtualHost();
@@ -420,11 +421,11 @@ public class MessageStoreTest extends Qp
createAllQueues();
createAllTopicQueues();
- Map<String, Exchange> exchanges = createExchanges();
+ Map<String, ExchangeImpl> exchanges = createExchanges();
- Exchange nonDurableExchange = exchanges.get(nonDurableExchangeName);
- Exchange directExchange = exchanges.get(directExchangeName);
- Exchange topicExchange = exchanges.get(topicExchangeName);
+ ExchangeImpl nonDurableExchange = exchanges.get(nonDurableExchangeName);
+ ExchangeImpl directExchange = exchanges.get(directExchangeName);
+ ExchangeImpl topicExchange = exchanges.get(topicExchangeName);
bindAllQueuesToExchange(nonDurableExchange, directRouting);
bindAllQueuesToExchange(directExchange, directRouting);
@@ -448,7 +449,7 @@ public class MessageStoreTest extends Qp
public void testDurableBindingRemoval() throws Exception
{
//create durable queue and exchange, bind them
- Exchange exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
+ ExchangeImpl exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
createQueue(durableQueueName, false, true, false, false);
bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false);
@@ -478,11 +479,11 @@ public class MessageStoreTest extends Qp
* and that the new exchanges are not the same objects as the provided list (i.e. that the
* reload actually generated new exchange objects)
*/
- private void validateExchanges(int originalNumExchanges, Map<String, Exchange> oldExchanges)
+ private void validateExchanges(int originalNumExchanges, Map<String, ExchangeImpl> oldExchanges)
{
- Collection<Exchange> exchanges = getVirtualHost().getExchanges();
+ Collection<ExchangeImpl> exchanges = getVirtualHost().getExchanges();
Collection<String> exchangeNames = new ArrayList(exchanges.size());
- for(Exchange exchange : exchanges)
+ for(ExchangeImpl exchange : exchanges)
{
exchangeNames.add(exchange.getName());
}
@@ -525,11 +526,11 @@ public class MessageStoreTest extends Qp
* @param bindings the set of bindings to validate
* @param useSelectors if set, check the binding has a JMS_SELECTOR argument and the correct value for it
*/
- private void validateBindingProperties(List<Binding> bindings, boolean useSelectors)
+ private void validateBindingProperties(Collection<? extends Binding> bindings, boolean useSelectors)
{
assertEquals("Each queue should only be bound once.", 1, bindings.size());
- Binding binding = bindings.get(0);
+ Binding binding = bindings.iterator().next();
if (useSelectors)
{
@@ -605,7 +606,7 @@ public class MessageStoreTest extends Qp
}
}
- private void sendMessageOnExchange(Exchange exchange, String routingKey, boolean deliveryMode)
+ private void sendMessageOnExchange(ExchangeImpl exchange, String routingKey, boolean deliveryMode)
{
//Set MessagePersistence
BasicContentHeaderProperties properties = new BasicContentHeaderProperties();
@@ -708,9 +709,9 @@ public class MessageStoreTest extends Qp
}
- private Map<String, Exchange> createExchanges() throws Exception
+ private Map<String, ExchangeImpl> createExchanges() throws Exception
{
- Map<String, Exchange> exchanges = new HashMap<String, Exchange>();
+ Map<String, ExchangeImpl> exchanges = new HashMap<String, ExchangeImpl>();
//Register non-durable DirectExchange
exchanges.put(nonDurableExchangeName, createExchange(DirectExchange.TYPE, nonDurableExchangeName, false));
@@ -722,9 +723,9 @@ public class MessageStoreTest extends Qp
return exchanges;
}
- private Exchange createExchange(ExchangeType<?> type, String name, boolean durable) throws Exception
+ private ExchangeImpl createExchange(ExchangeType<?> type, String name, boolean durable) throws Exception
{
- Exchange exchange = null;
+ ExchangeImpl exchange = null;
Map<String,Object> attributes = new HashMap<String, Object>();
@@ -739,7 +740,7 @@ public class MessageStoreTest extends Qp
return exchange;
}
- private void bindAllQueuesToExchange(Exchange exchange, String routingKey)
+ private void bindAllQueuesToExchange(ExchangeImpl exchange, String routingKey)
{
bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false);
bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false);
@@ -748,7 +749,7 @@ public class MessageStoreTest extends Qp
bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false);
}
- private void bindAllTopicQueuesToExchange(Exchange exchange, String routingKey)
+ private void bindAllTopicQueuesToExchange(ExchangeImpl exchange, String routingKey)
{
bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true);
@@ -758,7 +759,7 @@ public class MessageStoreTest extends Qp
}
- protected void bindQueueToExchange(Exchange exchange,
+ protected void bindQueueToExchange(ExchangeImpl exchange,
String routingKey,
AMQQueue queue,
boolean useSelector)
@@ -780,7 +781,7 @@ public class MessageStoreTest extends Qp
}
}
- protected void unbindQueueFromExchange(Exchange exchange,
+ protected void unbindQueueFromExchange(ExchangeImpl exchange,
String routingKey,
AMQQueue queue,
boolean useSelector)
@@ -794,8 +795,7 @@ public class MessageStoreTest extends Qp
try
{
- Binding b = exchange.getBinding(routingKey, queue);
- b.delete();
+ exchange.deleteBinding(routingKey, queue);
}
catch (Exception e)
{
@@ -833,18 +833,18 @@ public class MessageStoreTest extends Qp
assertNotNull("Queue(" + queueName + ") not correctly registered:", queue);
- assertEquals("Incorrect Message count on queue:" + queueName, messageCount, queue.getMessageCount());
+ assertEquals("Incorrect Message count on queue:" + queueName, messageCount, queue.getQueueDepthMessages());
}
private class TestMessagePublishInfo implements MessagePublishInfo
{
- Exchange _exchange;
+ ExchangeImpl _exchange;
boolean _immediate;
boolean _mandatory;
String _routingKey;
- TestMessagePublishInfo(Exchange exchange, boolean immediate, boolean mandatory, String routingKey)
+ TestMessagePublishInfo(ExchangeImpl exchange, boolean immediate, boolean mandatory, String routingKey)
{
_exchange = exchange;
_immediate = immediate;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Wed Feb 26 23:27:39 2014
@@ -49,7 +49,6 @@ public class Asserts
ConfiguredObject.LAST_UPDATED_BY,
ConfiguredObject.LAST_UPDATED_TIME,
ConfiguredObject.DESCRIPTION,
- VirtualHost.TIME_TO_LIVE,
VirtualHost.SUPPORTED_QUEUE_TYPES,
VirtualHost.STORE_PATH,
VirtualHost.CONFIG_PATH,
@@ -102,7 +101,6 @@ public class Asserts
Queue.LAST_UPDATED_TIME,
Queue.TYPE,
Queue.DESCRIPTION,
- Queue.TIME_TO_LIVE,
Queue.ALTERNATE_EXCHANGE,
Queue.OWNER,
Queue.NO_LOCAL,
@@ -205,7 +203,6 @@ public class Asserts
Connection.STATE,
Connection.DURABLE,
Connection.LIFETIME_POLICY,
- Connection.TIME_TO_LIVE,
Connection.INCOMING,
Connection.REMOTE_PROCESS_NAME,
Connection.REMOTE_PROCESS_PID,
@@ -254,7 +251,6 @@ public class Asserts
assertEquals("Unexpected value of attribute " + Port.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
port.get(Broker.LIFETIME_POLICY));
assertEquals("Unexpected value of attribute " + Port.STATE, state.name(), port.get(Port.STATE));
- assertEquals("Unexpected value of attribute " + Port.TIME_TO_LIVE, 0, port.get(Port.TIME_TO_LIVE));
@SuppressWarnings("unchecked")
Collection<String> protocols = (Collection<String>) port.get(Port.PROTOCOLS);
@@ -322,7 +318,7 @@ public class Asserts
{
assertNotNull("Exchange " + exchangeName + " is not found!", exchangeData);
assertAttributesPresent(exchangeData, AbstractConfiguredObject.getAttributeNames(Exchange.class),
- Exchange.ALTERNATE_EXCHANGE, Exchange.TIME_TO_LIVE,
+ Exchange.ALTERNATE_EXCHANGE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
ConfiguredObject.LAST_UPDATED_BY,
@@ -357,7 +353,6 @@ public class Asserts
assertAttributesPresent(binding,
AbstractConfiguredObject.getAttributeNames(Binding.class),
Binding.STATE,
- Binding.TIME_TO_LIVE,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Wed Feb 26 23:27:39 2014
@@ -306,7 +306,7 @@ public class AuthenticationProviderRestT
{
Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(
AuthenticationProvider.class),
- AuthenticationProvider.DESCRIPTION, AuthenticationProvider.TIME_TO_LIVE, ConfiguredObject.CREATED_BY,
+ AuthenticationProvider.DESCRIPTION, ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME, ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME);
assertEquals("Unexpected value of provider attribute " + AuthenticationProvider.STATE, State.ACTIVE.name(),
provider.get(AuthenticationProvider.STATE));
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Wed Feb 26 23:27:39 2014
@@ -65,7 +65,7 @@ public class BrokerRestHttpsTest extends
Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
- Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.TIME_TO_LIVE,
+ Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Wed Feb 26 23:27:39 2014
@@ -236,7 +236,6 @@ public class BrokerRestTest extends Qpid
{
Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
Broker.PROCESS_PID,
- Broker.TIME_TO_LIVE,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Wed Feb 26 23:27:39 2014
@@ -183,7 +183,7 @@ public class ConnectionRestTest extends
ConfiguredObject.DESCRIPTION,
Session.STATE,
Session.DURABLE,
- Session.LIFETIME_POLICY, Session.TIME_TO_LIVE);
+ Session.LIFETIME_POLICY);
assertEquals("Unexpecte value of attribute " + Session.NAME, session.getChannelId() + "",
sessionData.get(Session.NAME));
assertEquals("Unexpecte value of attribute " + Session.PRODUCER_FLOW_BLOCKED, Boolean.FALSE,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Wed Feb 26 23:27:39 2014
@@ -323,7 +323,6 @@ public class GroupProviderRestTest exten
private void assertProvider(String name, String type, Map<String, Object> provider)
{
Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(GroupProvider.class),
- GroupProvider.TIME_TO_LIVE,
ConfiguredObject.TYPE,
ConfiguredObject.CREATED_BY,
ConfiguredObject.CREATED_TIME,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java Wed Feb 26 23:27:39 2014
@@ -169,7 +169,7 @@ public class PreferencesProviderRestTest
ConfiguredObject.CREATED_TIME,
ConfiguredObject.LAST_UPDATED_BY,
ConfiguredObject.LAST_UPDATED_TIME,
- ConfiguredObject.DESCRIPTION, PreferencesProvider.TIME_TO_LIVE);
+ ConfiguredObject.DESCRIPTION);
assertEquals("Unexpected value of provider attribute " + PreferencesProvider.STATE, State.ACTIVE.name(),
provider.get(PreferencesProvider.STATE));
assertEquals("Unexpected value of provider attribute " + PreferencesProvider.LIFETIME_POLICY,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java Wed Feb 26 23:27:39 2014
@@ -212,7 +212,7 @@ public class QueueRestTest extends QpidR
{
assertNotNull("Consumer map should not be null", consumer);
Asserts.assertAttributesPresent(consumer,
- AbstractConfiguredObject.getAttributeNames(Consumer.class), Consumer.STATE, Consumer.TIME_TO_LIVE,
+ AbstractConfiguredObject.getAttributeNames(Consumer.class), Consumer.STATE,
Consumer.SETTLEMENT_MODE, Consumer.EXCLUSIVE, Consumer.SELECTOR,
Consumer.NO_LOCAL,
ConfiguredObject.TYPE,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java Wed Feb 26 23:27:39 2014
@@ -53,6 +53,8 @@ public class AddressBasedDestinationTest
@Override
public void setUp() throws Exception
{
+ setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.queues.maximumDeliveryCount",
+ "0");
super.setUp();
_connection = getConnection() ;
_connection.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org