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 2015/07/11 14:57:09 UTC
[7/7] camel git commit: Add new EIPs to Grooyy DSL
Add new EIPs to Grooyy DSL
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f9429f63
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f9429f63
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f9429f63
Branch: refs/heads/master
Commit: f9429f632a2f366509cd8ca4087ca846e3337996
Parents: 1fa390f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jul 11 13:05:42 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 11 13:05:42 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/groovy/extend/CamelGroovyMethods.java | 8 ++++++--
.../camel/groovy/extend/ClosureAggregationStrategy.java | 3 +--
.../org/apache/camel/groovy/extend/ClosureExpression.java | 2 +-
.../org/apache/camel/groovy/extend/ClosureProcessor.java | 2 +-
.../services/org.codehaus.groovy.runtime.ExtensionModule | 2 +-
.../src/main/resources/dsld/CamelGroovyMethods.dsld | 1 +
.../src/main/resources/gdsl/CamelGroovyMethods.gdsl | 1 +
7 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/CamelGroovyMethods.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/CamelGroovyMethods.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/CamelGroovyMethods.java
index cbdbdbd..79e84ee 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/CamelGroovyMethods.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/CamelGroovyMethods.java
@@ -54,13 +54,12 @@ import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.ExpressionSupport;
-
-
/**
* Extension class containing static methods that mainly allow to use Closures
* instead of Predicates, Expressions, Processors, or AggregationStrategies
*/
public final class CamelGroovyMethods {
+
private CamelGroovyMethods() {
// Utility Class
}
@@ -138,6 +137,11 @@ public final class CamelGroovyMethods {
// Extension Methods that use Closures as expressions
+ public static ProcessorDefinition<?> script(ProcessorDefinition<?> self,
+ Closure<?> expression) {
+ return self.script(toExpression(expression));
+ }
+
public static ProcessorDefinition<?> transform(ProcessorDefinition<?> self,
Closure<?> expression) {
return self.transform(toExpression(expression));
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
index 51fc467..c290db8 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureAggregationStrategy.java
@@ -23,7 +23,7 @@ import org.apache.camel.processor.aggregate.AggregationStrategy;
class ClosureAggregationStrategy implements AggregationStrategy {
- private Closure<Exchange> closure;
+ private final Closure<Exchange> closure;
ClosureAggregationStrategy(Closure<Exchange> closure) {
this.closure = closure;
@@ -34,5 +34,4 @@ class ClosureAggregationStrategy implements AggregationStrategy {
return ClosureSupport.call(closure, oldExchange, newExchange);
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
index af634a9..1309b7c 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureExpression.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.ExpressionSupport;
*/
class ClosureExpression extends ExpressionSupport {
- private Closure<?> closure;
+ private final Closure<?> closure;
ClosureExpression(Closure<?> closure) {
this.closure = closure;
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureProcessor.java b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureProcessor.java
index 96a330c..415543f 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureProcessor.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/groovy/extend/ClosureProcessor.java
@@ -26,7 +26,7 @@ import org.apache.camel.Processor;
*/
class ClosureProcessor implements Processor {
- private Closure<?> closure;
+ private final Closure<?> closure;
ClosureProcessor(Closure<?> closure) {
this.closure = closure;
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/components/camel-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
index 06353db..10db1bc 100644
--- a/components/camel-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
+++ b/components/camel-groovy/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
@@ -15,6 +15,6 @@
# limitations under the License.
#
moduleName=camel-groovy
-moduleVersion=2.11
+moduleVersion=2.15
extensionClasses=org.apache.camel.groovy.extend.CamelGroovyMethods
staticExtensionClasses=
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/resources/dsld/CamelGroovyMethods.dsld
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/resources/dsld/CamelGroovyMethods.dsld b/components/camel-groovy/src/main/resources/dsld/CamelGroovyMethods.dsld
index c5d46a9..3bb225a 100644
--- a/components/camel-groovy/src/main/resources/dsld/CamelGroovyMethods.dsld
+++ b/components/camel-groovy/src/main/resources/dsld/CamelGroovyMethods.dsld
@@ -19,6 +19,7 @@
method name : 'enrich', type : 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri : 'java.lang.String', aggregationLogic : 'groovy.lang.Closure']
method name : 'pollEnrich', type : 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri : 'java.lang.String', aggregationLogic : 'groovy.lang.Closure']
method name : 'pollEnrich', type : 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri : 'java.lang.String', timeout : 'long', aggregationLogic : 'groovy.lang.Closure']
+ method name : 'script', type : 'org.apache.camel.model.ProcessorDefinition', params: [expression : 'groovy.lang.Closure']
method name : 'transform', type : 'org.apache.camel.model.ProcessorDefinition', params: [expression : 'groovy.lang.Closure']
method name : 'setProperty', type : 'org.apache.camel.model.ProcessorDefinition', params: [name : 'java.lang.String', expression : 'groovy.lang.Closure']
method name : 'setHeader', type : 'org.apache.camel.model.ProcessorDefinition', params: [name : 'java.lang.String', expression : 'groovy.lang.Closure']
http://git-wip-us.apache.org/repos/asf/camel/blob/f9429f63/components/camel-groovy/src/main/resources/gdsl/CamelGroovyMethods.gdsl
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/resources/gdsl/CamelGroovyMethods.gdsl b/components/camel-groovy/src/main/resources/gdsl/CamelGroovyMethods.gdsl
index bcc425b..eac8545 100644
--- a/components/camel-groovy/src/main/resources/gdsl/CamelGroovyMethods.gdsl
+++ b/components/camel-groovy/src/main/resources/gdsl/CamelGroovyMethods.gdsl
@@ -19,6 +19,7 @@ contributor([context(ctype: 'org.apache.camel.model.ProcessorDefinition')]) {
method name: 'enrich', type: 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri: 'java.lang.String', aggregationLogic: 'groovy.lang.Closure']
method name: 'pollEnrich', type: 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri: 'java.lang.String', aggregationLogic: 'groovy.lang.Closure']
method name: 'pollEnrich', type: 'org.apache.camel.model.ProcessorDefinition', params: [resourceUri: 'java.lang.String', timeout: 'long', aggregationLogic: 'groovy.lang.Closure']
+ method name: 'script', type: 'org.apache.camel.model.ProcessorDefinition', params: [expression: 'groovy.lang.Closure']
method name: 'transform', type: 'org.apache.camel.model.ProcessorDefinition', params: [expression: 'groovy.lang.Closure']
method name: 'setProperty', type: 'org.apache.camel.model.ProcessorDefinition', params: [name: 'java.lang.String', expression: 'groovy.lang.Closure']
method name: 'setHeader', type: 'org.apache.camel.model.ProcessorDefinition', params: [name: 'java.lang.String', expression: 'groovy.lang.Closure']