[NO-JIRA] : [AMQP 1-0 Sandbox] Undo class name change
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1295603 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index 64a3f99..e523eb2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
@@ -33,7 +33,7 @@
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.exchange.topic.*;
-import org.apache.qpid.server.filter.JMSSelectorMessageFilter;
+import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.server.message.InboundMessage;
import javax.management.JMException;
@@ -86,7 +86,7 @@
private final Map<Binding, FieldTable> _bindings = new HashMap<Binding, FieldTable>();
- private final Map<String, WeakReference<JMSSelectorMessageFilter>> _selectorCache = new WeakHashMap<String, WeakReference<JMSSelectorMessageFilter>>();
+ private final Map<String, WeakReference<JMSSelectorFilter>> _selectorCache = new WeakHashMap<String, WeakReference<JMSSelectorFilter>>();
public TopicExchange()
{
@@ -178,17 +178,17 @@
}
- private JMSSelectorMessageFilter createSelectorFilter(final FieldTable args) throws AMQInvalidArgumentException
+ private JMSSelectorFilter createSelectorFilter(final FieldTable args) throws AMQInvalidArgumentException
{
final String selectorString = args.getString(AMQPFilterTypes.JMS_SELECTOR.getValue());
- WeakReference<JMSSelectorMessageFilter> selectorRef = _selectorCache.get(selectorString);
- JMSSelectorMessageFilter selector = null;
+ WeakReference<JMSSelectorFilter> selectorRef = _selectorCache.get(selectorString);
+ JMSSelectorFilter selector = null;
if(selectorRef == null || (selector = selectorRef.get())==null)
{
- selector = new JMSSelectorMessageFilter(selectorString);
- _selectorCache.put(selectorString, new WeakReference<JMSSelectorMessageFilter>(selector));
+ selector = new JMSSelectorFilter(selectorString);
+ _selectorCache.put(selectorString, new WeakReference<JMSSelectorFilter>(selector));
}
return selector;
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index ec9390e..dac5171 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
@@ -51,7 +51,7 @@
if (selector != null && !selector.equals(""))
{
manager = new SimpleFilterManager();
- manager.add(new JMSSelectorMessageFilter(selector));
+ manager.add(new JMSSelectorFilter(selector));
}
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorMessageFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
similarity index 89%
rename from qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorMessageFilter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index af07159..423bbc2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorMessageFilter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
@@ -26,14 +26,14 @@
import org.apache.qpid.server.queue.Filterable;
-public class JMSSelectorMessageFilter implements MessageFilter
+public class JMSSelectorFilter implements MessageFilter
{
- private final static Logger _logger = org.apache.log4j.Logger.getLogger(JMSSelectorMessageFilter.class);
+ private final static Logger _logger = org.apache.log4j.Logger.getLogger(JMSSelectorFilter.class);
private String _selector;
private BooleanExpression _matcher;
- public JMSSelectorMessageFilter(String selector) throws AMQInvalidArgumentException
+ public JMSSelectorFilter(String selector) throws AMQInvalidArgumentException
{
_selector = selector;
_matcher = new SelectorParser().parse(selector);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index dd4bd2b..1b335cf 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
@@ -44,7 +44,6 @@
import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
import org.apache.qpid.amqp_1_0.type.messaging.ExactSubjectFilter;
import org.apache.qpid.amqp_1_0.type.messaging.Filter;
-import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;
import org.apache.qpid.amqp_1_0.type.messaging.MatchingSubjectFilter;
import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
import org.apache.qpid.amqp_1_0.type.messaging.Released;
@@ -58,7 +57,7 @@
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.JMSSelectorMessageFilter;
+import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.server.filter.SimpleFilterManager;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -102,7 +101,7 @@
boolean noLocal = false;
- JMSSelectorMessageFilter messageFilter = null;
+ JMSSelectorFilter messageFilter = null;
if(destination instanceof QueueDestination)
{
@@ -126,13 +125,13 @@
actualFilters.put(entry.getKey(), entry.getValue());
noLocal = true;
}
- else if(messageFilter == null && entry.getValue() instanceof JMSSelectorFilter)
+ else if(messageFilter == null && entry.getValue() instanceof org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter)
{
- JMSSelectorFilter selectorFilter = (JMSSelectorFilter) entry.getValue();
+ org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter selectorFilter = (org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter) entry.getValue();
try
{
- messageFilter = new JMSSelectorMessageFilter(selectorFilter.getValue());
+ messageFilter = new JMSSelectorFilter(selectorFilter.getValue());
actualFilters.put(entry.getKey(), entry.getValue());
}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
index 00f3fc5..a0304a7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
@@ -1,7 +1,7 @@
package org.apache.qpid.server;
import junit.framework.TestCase;
-import org.apache.qpid.server.filter.JMSSelectorMessageFilter;
+import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.AMQException;/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -104,7 +104,7 @@
{
try
{
- new JMSSelectorMessageFilter(selector);
+ new JMSSelectorFilter(selector);
}
catch (AMQException e)
{
@@ -116,7 +116,7 @@
{
try
{
- new JMSSelectorMessageFilter(selector);
+ new JMSSelectorFilter(selector);
fail("Selector '" + selector + "' was parsed ");
}
catch (AMQException e)
