Author: kwall
Date: Sun Aug 23 17:34:50 2015
New Revision: 1697230
URL: http://svn.apache.org/r1697230
Log:
QPID-6709: [Java Broker] Give MessageFilter impls a toString so that SUB-1001
are useful for consumers using x-qpid-replay-period and no-local
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java?rev=1697230&r1=1697229&r2=1697230&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
Sun Aug 23 17:34:50 2015
@@ -88,26 +88,8 @@ class HeadersBinding
+"' to exchange
'"+_binding.getExchange().getName()
+"' with arguments: " + _binding.getArguments());
_filter = new FilterManager();
- _filter.add("x-exclude-all",new MessageFilter()
- {
- @Override
- public String getName()
- {
- return "";
- }
-
- @Override
- public boolean startAtTail()
- {
- return false;
- }
-
- @Override
- public boolean matches(Filterable message)
- {
- return false;
- }
- });
+
+ _filter.add("x-exclude-all", new ExcludeAllFilter());
}
}
for(Map.Entry<String, Object> entry : _mappings.entrySet())
@@ -302,4 +284,31 @@ class HeadersBinding
{
return _binding == null ? 0 : _binding.hashCode();
}
+
+ private static class ExcludeAllFilter implements MessageFilter
+ {
+ @Override
+ public String getName()
+ {
+ return "";
+ }
+
+ @Override
+ public boolean startAtTail()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean matches(Filterable message)
+ {
+ return false;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ExcludeAllFilter[]";
+ }
+ }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java?rev=1697230&r1=1697229&r2=1697230&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
Sun Aug 23 17:34:50 2015
@@ -74,4 +74,13 @@ public final class ArrivalTimeFilter imp
{
return (int) (_startingFrom ^ (_startingFrom >>> 32));
}
+
+ @Override
+ public String toString()
+ {
+ return "ArrivalTimeFilter[" +
+ "startingFrom=" + _startingFrom +
+ ", startAtTail=" + _startAtTail +
+ ']';
+ }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java?rev=1697230&r1=1697229&r2=1697230&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
Sun Aug 23 17:34:50 2015
@@ -176,7 +176,11 @@ public class FilterSupport
return _queue != null ? _queue.hashCode() : 0;
}
-
+ @Override
+ public String toString()
+ {
+ return "NoLocalFilter[]";
+ }
}
}
Modified:
qpid/java/trunk/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/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1697230&r1=1697229&r2=1697230&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Sun Aug 23 17:34:50 2015
@@ -755,28 +755,7 @@ public class AMQChannel
{
filterManager = new FilterManager();
}
- final Object connectionReference = getConnectionReference();
- MessageFilter filter = new MessageFilter()
- {
-
- @Override
- public String getName()
- {
- return AMQPFilterTypes.NO_LOCAL.toString();
- }
-
- @Override
- public boolean matches(final Filterable message)
- {
- return message.getConnectionReference() !=
connectionReference;
- }
-
- @Override
- public boolean startAtTail()
- {
- return false;
- }
- };
+ MessageFilter filter = new NoLocalFilter();
filterManager.add(filter.getName(), filter);
}
@@ -1475,6 +1454,41 @@ public class AMQChannel
return _maxUncommittedInMemorySize;
}
+ private class NoLocalFilter implements MessageFilter
+ {
+
+ private final Object _connectionReference;
+
+ public NoLocalFilter()
+ {
+ _connectionReference = getConnectionReference();
+ }
+
+ @Override
+ public String getName()
+ {
+ return AMQPFilterTypes.NO_LOCAL.toString();
+ }
+
+ @Override
+ public boolean matches(final Filterable message)
+ {
+ return message.getConnectionReference() != _connectionReference;
+ }
+
+ @Override
+ public boolean startAtTail()
+ {
+ return false;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "NoLocalFilter[]";
+ }
+ }
+
private class GetDeliveryMethod implements ClientDeliveryMethod
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
