You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bo...@apache.org on 2011/08/17 19:21:56 UTC
svn commit: r1158840 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/model/RouteDefinition.java
test/java/org/apache/camel/processor/RouteAutoStartupTest.java
test/resources/org/apache/camel/processor/routeAutoStartupTest.properties
Author: boday
Date: Wed Aug 17 17:21:55 2011
New Revision: 1158840
URL: http://svn.apache.org/viewvc?rev=1158840&view=rev
Log:
CAMEL-4217 - added Java DSL support for route autoStartup(String|boolean)
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java
camel/trunk/camel-core/src/test/resources/org/apache/camel/processor/routeAutoStartupTest.properties
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1158840&r1=1158839&r2=1158840&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Wed Aug 17 17:21:55 2011
@@ -442,6 +442,28 @@ public class RouteDefinition extends Pro
}
/**
+ * Sets the auto startup property on this route.
+ *
+ * @param autoStartup - String indicator ("true" or "false")
+ * @return the builder
+ */
+ public RouteDefinition autoStartup(String autoStartup) {
+ setAutoStartup(autoStartup);
+ return this;
+ }
+
+ /**
+ * Sets the auto startup property on this route.
+ *
+ * @param autoStartup - boolean indicator
+ * @return the builder
+ */
+ public RouteDefinition autoStartup(boolean autoStartup) {
+ setAutoStartup(Boolean.toString(autoStartup));
+ return this;
+ }
+
+ /**
* Configures the startup order for this route
* <p/>
* Camel will reorder routes and star them ordered by 0..N where 0 is the lowest number and N the highest number.
@@ -802,5 +824,4 @@ public class RouteDefinition extends Pro
routeContext.commit();
return routeContext;
}
-
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java?rev=1158840&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java Wed Aug 17 17:21:55 2011
@@ -0,0 +1,170 @@
+/**
+ * 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;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.properties.PropertiesComponent;
+
+/**
+ * @version
+ */
+public class RouteAutoStartupTest extends ContextTestSupport {
+
+ public void testRouteAutoStartedUsingBoolean() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").autoStartup(true).to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRouteNotAutoStartedUsingBoolean() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").id("route1").autoStartup(false).to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("route shouldn't be started yet");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
+
+ // reset mock, start route and resend message
+ mock.reset();
+ mock.expectedMessageCount(1);
+ context.startRoute("route1");
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRouteAutoStartedUsingString() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").autoStartup("true").to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRouteNotAutoStartedUsingString() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").id("route1").autoStartup("false").to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("route shouldn't be started yet");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
+
+ // reset mock, start route and resend message
+ mock.reset();
+ mock.expectedMessageCount(1);
+ context.startRoute("route1");
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRouteAutoStartedUsingProperties() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
+ PropertiesComponent properties = new PropertiesComponent();
+ properties.setLocation("classpath:org/apache/camel/processor/routeAutoStartupTest.properties");
+ context.addComponent("properties", properties);
+
+ from("direct:start").autoStartup("{{autoStartupProp}}").to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testRouteNotAutoStartedUsingProperties() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
+ PropertiesComponent properties = new PropertiesComponent();
+ properties.setLocation("classpath:org/apache/camel/processor/routeAutoStartupTest.properties");
+ context.addComponent("properties", properties);
+
+ from("direct:start").id("route1").autoStartup("{{noAutoStartupProp}}").to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("route shouldn't be started yet");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
+
+ // reset mock, start route and resend message
+ mock.reset();
+ mock.expectedMessageCount(1);
+ context.startRoute("route1");
+ template.sendBody("direct:start", "Hello World");
+ assertMockEndpointsSatisfied();
+ }
+}
Added: camel/trunk/camel-core/src/test/resources/org/apache/camel/processor/routeAutoStartupTest.properties
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/processor/routeAutoStartupTest.properties?rev=1158840&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/processor/routeAutoStartupTest.properties (added)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/processor/routeAutoStartupTest.properties Wed Aug 17 17:21:55 2011
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+autoStartupProp=true
+noAutoStartupProp=false
\ No newline at end of file