You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/10/27 02:09:47 UTC
git commit: CAMEL-7961 Clean up the autoStartup DSL in camel-scala
Repository: camel
Updated Branches:
refs/heads/master a73635400 -> dc073a749
CAMEL-7961 Clean up the autoStartup DSL in camel-scala
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc073a74
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc073a74
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc073a74
Branch: refs/heads/master
Commit: dc073a749f800bbc46809b8a29bec81002df8bc7
Parents: a736354
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Oct 27 09:09:17 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Oct 27 09:09:17 2014 +0800
----------------------------------------------------------------------
.../apache/camel/model/ProcessorDefinition.java | 19 -------------------
.../scala/org/apache/camel/scala/dsl/DSL.scala | 5 -----
.../camel/scala/dsl/SAbstractDefinition.scala | 5 -----
.../camel/scala/dsl/SRouteDefinition.scala | 7 +++++++
.../camel/scala/dsl/builder/RouteBuilder.scala | 5 -----
.../apache/camel/scala/dsl/AutoStartupTest.scala | 6 +++---
6 files changed, 10 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index a3b05cd..a6a8457 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -893,21 +893,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
return to(ExchangePattern.InOut, endpoints);
}
- public Type autoStartup(String autoStartup) {
- return autoStartup(Boolean.valueOf(autoStartup));
- }
-
- public Type autoStartup(boolean autoStartup) {
- ProcessorDefinition<?> def = this;
-
- RouteDefinition route = ProcessorDefinitionHelper.getRoute(def);
- if (route != null) {
- route.autoStartup(autoStartup);
- }
-
- return (Type) this;
- }
-
/**
* Sets the id of this node.
* <p/>
@@ -1018,10 +1003,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
return answer;
}
- public Type noAutoStartup() {
- return autoStartup(false);
- }
-
/**
* <a href="http://camel.apache.org/pipes-nd-filters.html">Pipes and Filters EIP:</a>
* Creates a {@link Pipeline} so that the message
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
index e061f78..9900246 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
@@ -49,9 +49,6 @@ trait DSL {
def handle[E <: Throwable : ClassTag](block: => Unit) : SOnExceptionDefinition[E]
- def autoStartup(autoStartup :String) : DSL
- def autoStartup(autoStartup :Boolean) : DSL
-
def id(id : String): DSL
def idempotentConsumer(expression: Exchange => Any): SIdempotentConsumerDefinition
def inOnly: DSL with Block
@@ -67,8 +64,6 @@ trait DSL {
def marshal(format : DataFormatDefinition) : DSL
def multicast : SMulticastDefinition
- def noAutoStartup() : DSL
-
def onCompletion : SOnCompletionDefinition
def onCompletion(predicate: Exchange => Boolean) : SOnCompletionDefinition
def onCompletion(config: Config[SOnCompletionDefinition]) : SOnCompletionDefinition
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index 280cf99..275b6d0 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -77,9 +77,6 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def handle[E <: Throwable : ClassTag](block: => Unit) = SOnExceptionDefinition[E](target.onException(classTag[E].runtimeClass.asInstanceOf[Class[E]])).apply(block)
- def autoStartup(autoStartup: String) = wrap(target.autoStartup(autoStartup))
- def autoStartup(autoStartup: Boolean) = wrap(target.autoStartup(autoStartup))
-
def id(id : String) = wrap(target.id(id))
def idempotentConsumer(expression: Exchange => Any) = SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
@Deprecated
@@ -97,8 +94,6 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def marshal(format: DataFormatDefinition) = wrap(target.marshal(format))
def multicast = SMulticastDefinition(target.multicast)
- def noAutoStartup() = wrap(target.autoStartup(false))
-
def onCompletion: SOnCompletionDefinition = {
val completion = SOnCompletionDefinition(target.onCompletion)
// let's end the block in the Java DSL, we have a better way of handling blocks here
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
index 332ee3e..3e012e4 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
@@ -33,4 +33,11 @@ case class SRouteDefinition(override val target: RouteDefinition, builder: Route
target.errorHandler(handler)
this
}
+
+ def autoStartup(autoStartup: String) = wrap(target.autoStartup(autoStartup))
+
+ def autoStartup(autoStartup: Boolean) = wrap(target.autoStartup(autoStartup))
+
+ def noAutoStartup() = wrap(target.autoStartup(false))
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
index b1aaad4..5d68b63 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
@@ -125,9 +125,6 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def filter(predicate: Exchange => Any) = stack.top.filter(predicate)
- def autoStartup(autoStartup :String) = stack.top.autoStartup(autoStartup)
- def autoStartup(autoStartup :Boolean) = stack.top.autoStartup(autoStartup)
-
def id(id : String) = stack.top.id(id)
def idempotentConsumer(expression: Exchange => Any) = stack.top.idempotentConsumer(expression)
def inOnly = stack.top.inOnly
@@ -155,8 +152,6 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def marshal(format: DataFormatDefinition) = stack.top.marshal(format)
def multicast = stack.top.multicast
- def noAutoStartup() = stack.top.autoStartup(false)
-
def onCompletion = {
stack.size match {
case 0 => SOnCompletionDefinition(builder.onCompletion)(this)
http://git-wip-us.apache.org/repos/asf/camel/blob/dc073a74/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala
index b70c29e..8b0fc72 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AutoStartupTest.scala
@@ -29,9 +29,9 @@ class AutoStartupTest extends CamelTestSupport with FunSuiteLike with BeforeAndA
override protected def createRouteBuilders(): Array[RouteBuilder] = {
Array(
createRoute(_ from s"direct:start1" id withoutDslRouteId to "mock:output"),
- createRoute(_ from s"direct:start2" id booleanDslRouteId autoStartup false to "mock:output"),
- createRoute(_ from s"direct:start3" id stringDslRouteId autoStartup "false" to "mock:output"),
- createRoute(_ from s"direct:start4" id noAutoStartupDslRouteId noAutoStartup() to "mock:output")
+ createRoute(_ from s"direct:start2" autoStartup false id booleanDslRouteId to "mock:output"),
+ createRoute(_ from s"direct:start3" autoStartup "false" id stringDslRouteId to "mock:output"),
+ createRoute(_ from s"direct:start4" noAutoStartup() id noAutoStartupDslRouteId to "mock:output")
)
}