camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] git commit: CAMEL-7649: camel-jms - The QueueBrowseStrategy need support for JMS Selector
Date Tue, 12 Aug 2014 08:38:51 GMT
CAMEL-7649: camel-jms - The QueueBrowseStrategy need support for JMS Selector


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a73ea67f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a73ea67f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a73ea67f

Branch: refs/heads/camel-2.12.x
Commit: a73ea67f0ff4463cd8f187f13970dcbb31864128
Parents: ef824f2
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jul 30 16:43:16 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Aug 12 10:38:38 2014 +0200

----------------------------------------------------------------------
 .../jms/DefaultQueueBrowseStrategy.java         | 23 ++++++++++++++++++++
 .../camel/component/jms/JmsQueueEndpoint.java   |  6 ++++-
 .../component/jms/QueueBrowseStrategy.java      |  2 ++
 .../camel/component/jms/JmsSelectorInTest.java  |  6 ++++-
 4 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a73ea67f/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
index e337e4f..f5cb164 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
@@ -57,4 +57,27 @@ public class DefaultQueueBrowseStrategy implements QueueBrowseStrategy
{
             }
         });
     }
+
+    @Override
+    public List<Exchange> browseSelected(final String selector, final JmsOperations
template, final String queue, final JmsQueueEndpoint endpoint) {
+        return template.browseSelected(queue, selector, new BrowserCallback<List<Exchange>>()
{
+            public List<Exchange> doInJms(Session session, QueueBrowser browser) throws
JMSException {
+                int size = endpoint.getMaximumBrowseSize();
+                if (size <= 0) {
+                    size = Integer.MAX_VALUE;
+                }
+
+                // not the best implementation in the world as we have to browse
+                // the entire queue, which could be massive
+                List<Exchange> answer = new ArrayList<Exchange>();
+                Enumeration<?> iter = browser.getEnumeration();
+                for (int i = 0; i < size && iter.hasMoreElements(); i++) {
+                    Message message = (Message) iter.nextElement();
+                    Exchange exchange = endpoint.createExchange(message);
+                    answer.add(exchange);
+                }
+                return answer;
+            }
+        });
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a73ea67f/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
index cafc1c1..e71c577 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java
@@ -95,7 +95,11 @@ public class JmsQueueEndpoint extends JmsEndpoint implements BrowsableEndpoint
{
         }
         String queue = getDestinationName();
         JmsOperations template = getConfiguration().createInOnlyTemplate(this, false, queue);
-        return queueBrowseStrategy.browse(template, queue, this);
+        if (getSelector() != null) {
+            return queueBrowseStrategy.browseSelected(getSelector(), template, queue, this);
+        } else {
+            return queueBrowseStrategy.browse(template, queue, this);
+        }
     }
 
     @ManagedOperation(description = "Current number of Exchanges in Queue")

http://git-wip-us.apache.org/repos/asf/camel/blob/a73ea67f/components/camel-jms/src/main/java/org/apache/camel/component/jms/QueueBrowseStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/QueueBrowseStrategy.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/QueueBrowseStrategy.java
index d973206..44727a2 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/QueueBrowseStrategy.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/QueueBrowseStrategy.java
@@ -28,4 +28,6 @@ public interface QueueBrowseStrategy {
 
     List<Exchange> browse(JmsOperations template, String queue, JmsQueueEndpoint endpoint);
 
+    List<Exchange> browseSelected(String selector, JmsOperations template, String queue,
JmsQueueEndpoint endpoint);
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a73ea67f/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
index 183cc57..00f3482 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
@@ -41,6 +41,10 @@ public class JmsSelectorInTest extends CamelTestSupport {
         template.sendBodyAndHeader("activemq:queue:foo", "Santa Rita", "drink", "wine");
 
         mock.assertIsSatisfied();
+
+        // and there should also only be 2 if browsing as the selector was configured in
the route builder
+        JmsQueueEndpoint endpoint = context.getEndpoint("activemq:queue:foo", JmsQueueEndpoint.class);
+        assertEquals(2, endpoint.getExchanges().size());
     }
 
     protected CamelContext createCamelContext() throws Exception {
@@ -58,7 +62,7 @@ public class JmsSelectorInTest extends CamelTestSupport {
                 JmsEndpoint endpoint = context.getEndpoint("activemq:queue:foo", JmsEndpoint.class);
                 endpoint.setSelector("drink IN ('beer', 'wine')");
 
-                from(endpoint).to("mock:result");
+                from(endpoint).to("log:drink").to("mock:result");
             }
         };
     }


Mime
View raw message