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 2010/06/27 19:33:39 UTC
svn commit: r958400 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/processor/RoutePolicyProcessor.java
test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
Author: davsclaus
Date: Sun Jun 27 17:33:38 2010
New Revision: 958400
URL: http://svn.apache.org/viewvc?rev=958400&view=rev
Log:
CAMEL-2863: RoutePolicy supports the async routing engine
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java?rev=958400&r1=958399&r2=958400&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutePolicyProcessor.java Sun Jun 27 17:33:38 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel.processor;
+import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -27,9 +28,7 @@ import org.apache.camel.spi.RoutePolicy;
/**
* @version $Revision$
*/
-public class RoutePolicyProcessor extends DelegateProcessor {
-
- // TODO: Support async routing engine
+public class RoutePolicyProcessor extends DelegateAsyncProcessor {
private final RoutePolicy routePolicy;
private Route route;
@@ -45,7 +44,7 @@ public class RoutePolicyProcessor extend
}
@Override
- protected void processNext(Exchange exchange) throws Exception {
+ public boolean process(Exchange exchange, AsyncCallback callback) {
// check whether the policy is enabled
if (isRoutePolicyRunAllowed()) {
@@ -73,9 +72,7 @@ public class RoutePolicyProcessor extend
});
}
- if (processor != null) {
- processor.process(exchange);
- }
+ return super.process(exchange, callback);
}
public void setRoute(Route route) {
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java?rev=958400&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java Sun Jun 27 17:33:38 2010
@@ -0,0 +1,118 @@
+/**
+ * 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.processor.async;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Route;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.RoutePolicySupport;
+
+/**
+ * @version $Revision$
+ */
+public class AsyncEndpointCustomRoutePolicyTest extends ContextTestSupport {
+
+ private static String beforeThreadName;
+ private static String afterThreadName;
+
+ private final MyCustomRoutePolicy policy = new MyCustomRoutePolicy();
+
+ private class MyCustomRoutePolicy extends RoutePolicySupport {
+
+ private volatile int invoked;
+ private volatile AtomicBoolean stopped = new AtomicBoolean();
+
+ @Override
+ public void onExchangeDone(Route route, Exchange exchange) {
+ invoked++;
+ if (invoked >= 2) {
+ try {
+ stopped.set(true);
+ stopConsumer(route.getConsumer());
+ } catch (Exception e) {
+ handleException(e);
+ }
+ }
+ }
+
+ public boolean isStopped() {
+ return stopped.get();
+ }
+ }
+
+ public void testAsyncEndpoint() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Bye Camel");
+
+ getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
+ getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
+
+ String reply = template.requestBody("direct:start", "Hello Camel", String.class);
+ assertEquals("Bye Camel", reply);
+
+ assertMockEndpointsSatisfied();
+
+ assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(afterThreadName));
+
+ mock.reset();
+ mock.expectedMessageCount(1);
+
+ // we send a 2nd message which should cause it to stop
+ template.sendBody("direct:start", "stop");
+
+ mock.assertIsSatisfied();
+
+ // give time for slow boxes
+ Thread.sleep(500);
+
+ assertTrue("Should be stopped", policy.isStopped());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ context.addComponent("async", new MyAsyncComponent());
+
+ from("direct:start").routeId("foo").routePolicy(policy)
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ beforeThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("async:Bye Camel")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
+ }
+ };
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date