You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/30 15:13:32 UTC
svn commit: r789703 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/seda/
test/java/org/apache/camel/component/direct/
test/java/org/apache/camel/component/seda/
test/java/org/apache/camel/component/vm/
Author: davsclaus
Date: Tue Jun 30 13:13:32 2009
New Revision: 789703
URL: http://svn.apache.org/viewvc?rev=789703&view=rev
Log:
CAMEL-1756: seda component now holds list of known queues so they can be reused by endpoints with different uri parameters. They behave now like a jms queues and does not confuse end users.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java?rev=789703&r1=789702&r2=789703&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java Tue Jun 30 13:13:32 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.seda;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -32,9 +33,20 @@
*/
public class SedaComponent extends DefaultComponent {
- public BlockingQueue<Exchange> createQueue(String uri, Map parameters) {
+ private final Map<String, BlockingQueue<Exchange>> queues = new HashMap<String, BlockingQueue<Exchange>>();
+
+ public synchronized BlockingQueue<Exchange> createQueue(String uri, Map parameters) {
+ String key = getQueueKey(uri);
+
+ if (queues.containsKey(key)) {
+ return queues.get(key);
+ }
+
+ // create queue
int size = getAndRemoveParameter(parameters, "size", Integer.class, 1000);
- return new LinkedBlockingQueue<Exchange>(size);
+ BlockingQueue<Exchange> queue = new LinkedBlockingQueue<Exchange>(size);
+ queues.put(key, queue);
+ return queue;
}
@Override
@@ -44,4 +56,19 @@
answer.configureProperties(parameters);
return answer;
}
+
+ protected String getQueueKey(String uri) {
+ if (uri.contains("?")) {
+ // strip parameters
+ uri = uri.substring(0, uri.indexOf("?"));
+ }
+ return uri;
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ queues.clear();
+ super.doStop();
+ }
+
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java?rev=789703&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java Tue Jun 30 13:13:32 2009
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.direct;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class DirectQueueTest extends ContextTestSupport {
+
+ public void testQueue() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Bar");
+
+ template.sendBody("direct:foo", "Hello World");
+ template.sendBody("direct:foo?allowMultipleConsumers=false", "Bye World");
+ template.sendBody("direct:bar", "Bar");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").to("mock:result");
+
+ from("direct:bar?allowMultipleConsumers=false").to("mock:result");
+ }
+ };
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java?rev=789703&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java Tue Jun 30 13:13:32 2009
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.seda;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class SedaQueueTest extends ContextTestSupport {
+
+ public void testQueue() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Goodday World", "Bar");
+
+ template.sendBody("seda:foo", "Hello World");
+ template.sendBody("seda:foo?size=20", "Bye World");
+ template.sendBody("seda:foo?concurrentConsumers=5", "Goodday World");
+ template.sendBody("seda:bar", "Bar");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("seda:foo?concurrentConsumers=2").to("mock:result");
+
+ from("seda:bar").to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java?rev=789703&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java Tue Jun 30 13:13:32 2009
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.vm;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class VmQueueTest extends ContextTestSupport {
+
+ public void testQueue() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Goodday World", "Bar");
+
+ template.sendBody("vm:foo", "Hello World");
+ template.sendBody("vm:foo?size=20", "Bye World");
+ template.sendBody("vm:foo?concurrentConsumers=5", "Goodday World");
+ template.sendBody("vm:bar", "Bar");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("vm:foo?concurrentConsumers=2").to("mock:result");
+
+ from("vm:bar").to("mock:result");
+ }
+ };
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date