You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/23 11:57:03 UTC
svn commit: r1775819 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/message/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apach...
Author: kwall
Date: Fri Dec 23 11:57:02 2016
New Revision: 1775819
URL: http://svn.apache.org/viewvc?rev=1775819&view=rev
Log:
QPID-6028 : [Java Broker] PublishingLink is a generalisation of Binding
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java
- copied, changed from r1775818, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Fri Dec 23 11:57:02 2016
@@ -62,6 +62,7 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.Param;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
@@ -172,7 +173,7 @@ public abstract class AbstractExchange<T
if (messageDestination != null)
{
onBind(new BindingIdentifier(b.getBindingKey(), messageDestination), b.getArguments());
- messageDestination.linkAdded(this, b.getBindingKey());
+ messageDestination.linkAdded(this, b);
}
}
}
@@ -211,7 +212,7 @@ public abstract class AbstractExchange<T
final MessageDestination messageDestination = getAttainedMessageDestination(b.getDestination());
if(messageDestination != null)
{
- messageDestination.linkRemoved(this, b.getBindingKey());
+ messageDestination.linkRemoved(this, b);
}
}
for(MessageSender sender : _linkedSenders.keySet())
@@ -646,13 +647,13 @@ public abstract class AbstractExchange<T
getEventLogger().message(_logSubject, BindingMessages.CREATED(String.valueOf(bindArguments)));
onBind(bindingIdentifier, arguments);
- messageDestination.linkAdded(this, bindingKey);
+ messageDestination.linkAdded(this, newBinding);
}
return true;
}
@Override
- public Collection<Binding> getBindingsForDestination(MessageDestination destination)
+ public Collection<Binding> getPublishingLinks(MessageDestination destination)
{
List<Binding> bindings = new ArrayList<>();
final String destinationName = destination.getName();
@@ -727,7 +728,7 @@ public abstract class AbstractExchange<T
if(binding.getBindingKey().equals(bindingKey) && binding.getDestination().equals(destination))
{
_bindings.remove(binding);
- messageDestination.linkRemoved(this, bindingKey);
+ messageDestination.linkRemoved(this, binding);
onUnbind(new BindingIdentifier(bindingKey, messageDestination));
if(!autoDeleteIfNecessary())
{
@@ -946,7 +947,7 @@ public abstract class AbstractExchange<T
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
Integer oldValue = _linkedSenders.putIfAbsent(sender, 1);
if(oldValue != null)
@@ -956,7 +957,7 @@ public abstract class AbstractExchange<T
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
int oldValue = _linkedSenders.remove(sender);
if(oldValue != 1)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java Fri Dec 23 11:57:02 2016
@@ -31,6 +31,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.PermissionedObject;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.security.AccessControl;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.SecurityToken;
@@ -139,13 +140,13 @@ public class DefaultDestination implemen
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageDestination.java Fri Dec 23 11:57:02 2016
@@ -24,6 +24,7 @@ import java.security.AccessControlExcept
import java.util.Map;
import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.security.SecurityToken;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -57,6 +58,6 @@ public interface MessageDestination exte
boolean isDurable();
- void linkAdded(MessageSender sender, String linkName);
- void linkRemoved(MessageSender sender, String linkName);
+ void linkAdded(MessageSender sender, PublishingLink link);
+ void linkRemoved(MessageSender sender, PublishingLink link);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java Fri Dec 23 11:57:02 2016
@@ -20,7 +20,13 @@
*/
package org.apache.qpid.server.message;
+import java.util.Collection;
+
+import org.apache.qpid.server.model.PublishingLink;
+
public interface MessageSender
{
void destinationRemoved(MessageDestination destination);
+
+ Collection<? extends PublishingLink> getPublishingLinks(MessageDestination destination);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java Fri Dec 23 11:57:02 2016
@@ -23,9 +23,8 @@ package org.apache.qpid.server.model;
import java.util.Map;
@ManagedAttributeValueType
-public interface Binding extends ManagedAttributeValue
+public interface Binding extends PublishingLink
{
String getBindingKey();
- String getDestination();
Map<String,Object> getArguments();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Fri Dec 23 11:57:02 2016
@@ -59,7 +59,8 @@ public interface Exchange<X extends Exch
@DerivedAttribute
Collection<Binding> getBindings();
- Collection<Binding> getBindingsForDestination(MessageDestination destination);
+ @Override
+ Collection<Binding> getPublishingLinks(MessageDestination destination);
@DerivedAttribute(persist = true)
Collection<Binding> getDurableBindings();
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java (from r1775818, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java&r1=1775818&r2=1775819&rev=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java Fri Dec 23 11:57:02 2016
@@ -20,12 +20,8 @@
*/
package org.apache.qpid.server.model;
-import java.util.Map;
-
@ManagedAttributeValueType
-public interface Binding extends ManagedAttributeValue
+public interface PublishingLink extends ManagedAttributeValue
{
- String getBindingKey();
String getDestination();
- Map<String,Object> getArguments();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Fri Dec 23 11:57:02 2016
@@ -259,7 +259,7 @@ public interface Queue<X extends Queue<X
boolean isHoldOnPublishEnabled();
@ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
- Collection<Binding> getBindings();
+ Collection<PublishingLink> getPublishingLinks();
@ManagedOperation(nonModifying = true, changesConfiguredObjectState = false)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Fri Dec 23 11:57:02 2016
@@ -1034,15 +1034,15 @@ public abstract class AbstractQueue<X ex
}
- public Collection<Binding> getBindings()
+ public Collection<PublishingLink> getPublishingLinks()
{
- List<Binding> bindings = new ArrayList<>();
+ List<PublishingLink> links = new ArrayList<>();
for(MessageSender sender : _linkedSenders.keySet())
{
- //TODO - eliminate cast
- bindings.addAll(((Exchange)sender).getBindingsForDestination(this));
+ final Collection<? extends PublishingLink> linksForDestination = sender.getPublishingLinks(this);
+ links.addAll(linksForDestination);
}
- return bindings;
+ return links;
}
@Override
@@ -3397,7 +3397,7 @@ public abstract class AbstractQueue<X ex
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
Integer oldValue = _linkedSenders.putIfAbsent(sender, 1);
@@ -3409,7 +3409,7 @@ public abstract class AbstractQueue<X ex
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
int oldValue = _linkedSenders.remove(sender);
if(oldValue != 1)
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Fri Dec 23 11:57:02 2016
@@ -153,8 +153,8 @@ abstract class AbstractQueueTestBase ext
assertTrue("Queue was not bound to key",
_exchange.isBound(_routingKey,_queue));
assertEquals("Exchange binding count", 1,
- _queue.getBindings().size());
- final Binding firstBinding = _queue.getBindings().iterator().next();
+ _queue.getPublishingLinks().size());
+ final Binding firstBinding = (Binding) _queue.getPublishingLinks().iterator().next();
assertEquals("Wrong binding key", _routingKey,
firstBinding.getBindingKey());
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java Fri Dec 23 11:57:02 2016
@@ -50,6 +50,7 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.plugin.SystemAddressSpaceCreator;
import org.apache.qpid.server.protocol.AMQSessionModel;
@@ -377,13 +378,13 @@ public class ManagementAddressSpace impl
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
}
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri Dec 23 11:57:02 2016
@@ -77,6 +77,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.OperationParameter;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.MessageConverterRegistry;
@@ -382,13 +383,13 @@ class ManagementNode implements MessageS
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
}
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java Fri Dec 23 11:57:02 2016
@@ -35,6 +35,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.message.MessageContainer;
import org.apache.qpid.server.security.SecurityToken;
@@ -158,13 +159,13 @@ class ManagementNodeConsumer<T extends C
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
}
Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java (original)
+++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java Fri Dec 23 11:57:02 2016
@@ -50,6 +50,7 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.NamedAddressSpace;
+import org.apache.qpid.server.model.PublishingLink;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.SecurityToken;
import org.apache.qpid.server.store.MessageDurability;
@@ -109,13 +110,13 @@ public class ProxyMessageSource implemen
}
@Override
- public void linkAdded(final MessageSender sender, final String linkName)
+ public void linkAdded(final MessageSender sender, final PublishingLink link)
{
}
@Override
- public void linkRemoved(final MessageSender sender, final String linkName)
+ public void linkRemoved(final MessageSender sender, final PublishingLink link)
{
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1775819&r1=1775818&r2=1775819&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri Dec 23 11:57:02 2016
@@ -441,13 +441,13 @@ public class VirtualHostMessageStoreTest
bindQueueToExchange(exch, directRouting, _virtualHost.getChildByName(Queue.class, durableQueueName), false);
assertEquals("Incorrect number of bindings registered before recovery",
- 1, _virtualHost.getChildByName(Queue.class, durableQueueName).getBindings().size());
+ 1, _virtualHost.getChildByName(Queue.class, durableQueueName).getPublishingLinks().size());
//verify binding is actually normally recovered
reloadVirtualHost();
assertEquals("Incorrect number of bindings registered after first recovery",
- 1, _virtualHost.getChildByName(Queue.class, durableQueueName).getBindings().size());
+ 1, _virtualHost.getChildByName(Queue.class, durableQueueName).getPublishingLinks().size());
exch = (Exchange<?>) _virtualHost.getChildByName(Exchange.class, directExchangeName);
assertNotNull("Exchange was not recovered", exch);
@@ -459,7 +459,7 @@ public class VirtualHostMessageStoreTest
reloadVirtualHost();
assertEquals("Incorrect number of bindings registered after second recovery",
- 0, _virtualHost.getChildByName(Queue.class, durableQueueName).getBindings().size());
+ 0, _virtualHost.getChildByName(Queue.class, durableQueueName).getPublishingLinks().size());
}
/**
@@ -499,11 +499,11 @@ public class VirtualHostMessageStoreTest
assertEquals("Incorrect number of (durable) queues following recovery", 6, _virtualHost.getChildren(Queue.class).size());
- validateBindingProperties(_virtualHost.getChildByName(Queue.class, durablePriorityQueueName).getBindings(), false);
- validateBindingProperties(_virtualHost.getChildByName(Queue.class, durablePriorityTopicQueueName).getBindings(), true);
- validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableQueueName).getBindings(), false);
- validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableTopicQueueName).getBindings(), true);
- validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableExclusiveQueueName).getBindings(), false);
+ validateBindingProperties(_virtualHost.getChildByName(Queue.class, durablePriorityQueueName).getPublishingLinks(), false);
+ validateBindingProperties(_virtualHost.getChildByName(Queue.class, durablePriorityTopicQueueName).getPublishingLinks(), true);
+ validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableQueueName).getPublishingLinks(), false);
+ validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableTopicQueueName).getPublishingLinks(), true);
+ validateBindingProperties(_virtualHost.getChildByName(Queue.class, durableExclusiveQueueName).getPublishingLinks(), false);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org