[3/3] git commit: CAMEL-6238: camel-jsonpath component.
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/969d8814
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/969d8814
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/969d8814
Branch: refs/heads/master
Commit: 969d88146d282c1ddaa6c7f8c9fb2ecc79379850
Parents: 794ee2c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 12:41:10 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:30 2013 +0200
--
apache-camel/pom.xml| 4 ++
.../src/main/descriptors/common-bin.xml | 1 +
.../org/apache/camel/jsonpath/JSonPath.java | 40
parent/pom.xml | 6 +++
.../features/src/main/resources/features.xml| 5 +++
5 files changed, 56 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f7c05c0..18c4d4a 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -313,6 +313,10 @@
/dependency
dependency
groupIdorg.apache.camel/groupId
+ artifactIdcamel-jsonpath/artifactId
+/dependency
+dependency
+ groupIdorg.apache.camel/groupId
artifactIdcamel-juel/artifactId
/dependency
dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index db1a9c6..8083d23 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -91,6 +91,7 @@
includeorg.apache.camel:camel-josql/include
includeorg.apache.camel:camel-jpa/include
includeorg.apache.camel:camel-jsch/include
+includeorg.apache.camel:camel-jsonpath/include
includeorg.apache.camel:camel-jt400/include
includeorg.apache.camel:camel-juel/include
includeorg.apache.camel:camel-jxpath/include
http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
new file mode 100644
index 000..601d64c
--- /dev/null
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
@@ -0,0 +1,40 @@
+/**
+ * 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.jsonpath;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.camel.language.LanguageAnnotation;
+
+/**
+ * An annotation used to inject a a
href=http://commons.apache.org/jsonpath/;JSon Path/a
+ * expression into a method parameter when using
+ * a href=http://camel.apache.org/bean-integration.html;Bean Integration/a
+ *
+ * @version
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@LanguageAnnotation(language = jsonpath)
+public @interface JSonPath {
+String value();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5f5c049..8c7ddb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -236,6 +236,7 @@
jsonlib-bundle-version2.4_1/jsonlib-bundle-version
jsonlib-version2.4/jsonlib-version
[2/3] git commit: CAMEL-6238: camel-jsonpath component.
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/794ee2c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/794ee2c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/794ee2c8
Branch: refs/heads/master
Commit: 794ee2c8fe529a7c694c3079e1e9945c986e5c5c
Parents: 293b85c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 11:53:16 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:30 2013 +0200
--
.../apache/camel/builder/ExpressionClause.java | 12
.../camel/builder/ExpressionClauseSupport.java | 12
.../model/language/JsonPathExpression.java | 42 +
.../org/apache/camel/model/language/jaxb.index | 1 +
components/camel-jsonpath/pom.xml | 4 +-
.../apache/camel/jsonpath/JSonPathEngine.java | 37 +++
.../camel/jsonpath/JsonPathExpression.java | 38
.../apache/camel/jsonpath/JsonPathLanguage.java | 35 ---
.../apache/camel/jsonpath/JsonPathCBRTest.java | 4 +-
.../camel/jsonpath/JsonPathTransformTest.java | 2 +-
.../camel/jsonpath/SpringJsonPathCBRTest.java | 65
.../jsonpath/SpringJsonPathTransformTest.java | 46 ++
.../camel/jsonpath/SpringJsonPathCBTTest.xml| 43 +
.../jsonpath/SpringJsonPathTransformTest.xml| 34 ++
14 files changed, 324 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 2e42ded..07ab027 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -277,6 +277,18 @@ public class ExpressionClauseT extends
ExpressionDefinition {
}
/**
+ * Evaluates a a
+ * href=http://camel.apache.org/jsonpath.html;JSon Path
+ * expression/a
+ *
+ * @param text the expression to be evaluated
+ * @return the builder to continue processing the DSL
+ */
+public T jsonPath(String text) {
+return delegate.jsonPath(text);
+}
+
+/**
* Evaluates a a href=http://commons.apache.org/jxpath/;JXPath
expression/a
*
* @param text the expression to be evaluated
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index b970806..64955c2 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -28,6 +28,7 @@ import org.apache.camel.model.language.GroovyExpression;
import org.apache.camel.model.language.HeaderExpression;
import org.apache.camel.model.language.JXPathExpression;
import org.apache.camel.model.language.JavaScriptExpression;
+import org.apache.camel.model.language.JsonPathExpression;
import org.apache.camel.model.language.LanguageExpression;
import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.model.language.MvelExpression;
@@ -312,6 +313,17 @@ public class ExpressionClauseSupportT {
}
/**
+ * Evaluates a a href=http://camel.apache.org/jsonpath.html;JSon Path
+ * expression/a
+ *
+ * @param text the expression to be evaluated
+ * @return the builder to continue processing the DSL
+ */
+public T jsonPath(String text) {
+return expression(new JsonPathExpression(text));
+}
+
+/**
* Evaluates a a href=http://commons.apache.org/jxpath/;JXPath
expression/a
*
* @param text the expression to be evaluated
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
new file mode 100644
index 000..31c32e2
--- /dev/null
+++
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software
[1/3] git commit: CAMEL-6238: camel-jsonpath component.
Updated Branches:
refs/heads/master 439c32e0e - 969d88146
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/293b85c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/293b85c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/293b85c6
Branch: refs/heads/master
Commit: 293b85c6e2508e6e4217f576b8d513cd44193f57
Parents: 439c32e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 11:26:44 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:29 2013 +0200
--
components/camel-jsonpath/pom.xml | 63 ++
.../camel/jsonpath/JsonPathExpression.java | 38
.../apache/camel/jsonpath/JsonPathLanguage.java | 64 ++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/language/jsonpath | 18 ++
.../apache/camel/jsonpath/JsonPathCBRTest.java | 77 +++
.../camel/jsonpath/JsonPathLanguageTest.java| 67 ++
.../camel/jsonpath/JsonPathTransformTest.java | 53 +
.../src/test/resources/average.json | 16 ++
.../src/test/resources/books.json | 22 ++
.../src/test/resources/cheap.json | 15 ++
.../src/test/resources/expensive.json | 16 ++
.../src/test/resources/log4j.properties | 36
components/pom.xml | 3 +-
parent/pom.xml | 1 +
16 files changed, 702 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml
b/components/camel-jsonpath/pom.xml
new file mode 100644
index 000..670f266
--- /dev/null
+++ b/components/camel-jsonpath/pom.xml
@@ -0,0 +1,63 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ 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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.camel/groupId
+artifactIdcomponents/artifactId
+version2.12.2-SNAPSHOT/version
+ /parent
+
+ artifactIdcamel-jsonpath/artifactId
+ packagingbundle/packaging
+ nameCamel :: JSon Path/name
+ descriptionCamel JSON Path Language/description
+
+ properties
+camel.osgi.export.pkgorg.apache.camel.jsonpath.*/camel.osgi.export.pkg
+
camel.osgi.export.serviceorg.apache.camel.spi.LanguageResolver;language=jsonpath/camel.osgi.export.service
+ /properties
+
+ dependencies
+dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-core/artifactId
+/dependency
+ dependency
+ groupIdcom.jayway.jsonpath/groupId
+ artifactIdjson-path/artifactId
+ version${json-path-version}/version
+/dependency
+
+!-- testing --
+dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-test/artifactId
+ scopetest/scope
+/dependency
+dependency
+ groupIdorg.slf4j/groupId
+ artifactIdslf4j-log4j12/artifactId
+ scopetest/scope
+/dependency
+
+ /dependencies
+
+/project
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
new file mode 100644
index 000..8d39e7c
--- /dev/null
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *
git commit: CAMEL-6238: camel-jsonpath component.
Updated Branches:
refs/heads/master 969d88146 - 7817d1434
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7817d143
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7817d143
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7817d143
Branch: refs/heads/master
Commit: 7817d14343e2e7e6a19f3ad82492726224f3e492
Parents: 969d881
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:28:46 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:28:46 2013 +0200
--
.../apache/camel/jsonpath/JSonPathEngine.java | 37 ++--
.../apache/camel/jsonpath/JsonPathLanguage.java | 20 ++-
2 files changed, 46 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7817d143/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
index 48bde5c..745ce0e 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
@@ -16,22 +16,55 @@
*/
package org.apache.camel.jsonpath;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
+import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.JsonPath;
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.WrappedFile;
public class JSonPathEngine {
private final String expression;
private final JsonPath path;
+private final Configuration configuration;
public JSonPathEngine(String expression) {
this.expression = expression;
+this.configuration = Configuration.defaultConfiguration();
this.path = JsonPath.compile(expression);
}
-public Object read(InputStream json) throws IOException {
-return path.read(json);
+public Object read(Exchange exchange) throws IOException,
InvalidPayloadException {
+Object json = exchange.getIn().getBody();
+
+if (json instanceof WrappedFile) {
+json = ((WrappedFile) json).getFile();
+}
+
+// the message body type should use the suitable read method
+if (configuration.getProvider().isContainer(json)) {
+return path.read(json);
+} else if (json instanceof String) {
+String str = (String) json;
+return path.read(str);
+} else if (json instanceof InputStream) {
+InputStream is = (InputStream) json;
+return path.read(is);
+} else if (json instanceof File) {
+File file = (File) json;
+return path.read(file);
+} else if (json instanceof URL) {
+URL url = (URL) json;
+return path.read(url);
+}
+
+// fallback as input stream
+InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+return path.read(is);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7817d143/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
index 9776f77..b53ce36 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.jsonpath;
-import java.io.InputStream;
-
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.ExpressionEvaluationException;
@@ -25,7 +23,6 @@ import org.apache.camel.ExpressionIllegalSyntaxException;
import org.apache.camel.Predicate;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.LanguageSupport;
-import org.apache.camel.util.IOHelper;
public class JsonPathLanguage extends LanguageSupport {
@@ -47,6 +44,11 @@ public class JsonPathLanguage extends LanguageSupport {
throw new ExpressionEvaluationException(this, exchange, e);
}
}
+
+@Override
+public String toString() {
+return jsonpath[ + predicate + ];
+}
git commit: CAMEL-6238: camel-jsonpath component.
Updated Branches:
refs/heads/master 7817d1434 - c4f236e8e
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4f236e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4f236e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4f236e8
Branch: refs/heads/master
Commit: c4f236e8e382b89f27837aafdb4b28542b86a2c2
Parents: 7817d14
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:37:50 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:37:50 2013 +0200
--
components/camel-jsonpath/pom.xml | 7 +++-
.../org/apache/camel/jsonpath/JSonPath.java | 2 +-
.../apache/camel/jsonpath/JSonPathEngine.java | 4 +-
.../apache/camel/jsonpath/JsonPathLanguage.java | 10 ++---
.../camel/itest/karaf/CamelJsonPathTest.java| 40
5 files changed, 53 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml
b/components/camel-jsonpath/pom.xml
index 22033a8..a8514cb 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
@@ -31,6 +32,8 @@
descriptionCamel JSON Path Language/description
properties
+!-- need to import spi as felix-bundle-plugin has a bug and do not
include this package despite we use in the source code --
+
camel.osgi.import.before.defaultsorg.apache.camel.spi;${camel.osgi.import.strict.version}/camel.osgi.import.before.defaults
camel.osgi.export.pkgorg.apache.camel.jsonpath.*/camel.osgi.export.pkg
camel.osgi.export.serviceorg.apache.camel.spi.LanguageResolver;language=jsonpath/camel.osgi.export.service
/properties
@@ -40,7 +43,7 @@
groupIdorg.apache.camel/groupId
artifactIdcamel-core/artifactId
/dependency
- dependency
+dependency
groupIdcom.jayway.jsonpath/groupId
artifactIdjson-path/artifactId
version${json-path-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
index 601d64c..354875c 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
@@ -35,6 +35,6 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = jsonpath)
-public @interface JSonPath {
+public @interface JsonPath {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
index 745ce0e..4724199 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
@@ -27,13 +27,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.WrappedFile;
-public class JSonPathEngine {
+public class JsonPathEngine {
private final String expression;
private final JsonPath path;
private final Configuration configuration;
-public JSonPathEngine(String expression) {
+public JsonPathEngine(String expression) {
this.expression = expression;
this.configuration = Configuration.defaultConfiguration();
this.path = JsonPath.compile(expression);
git commit: CAMEL-6238: camel-jsonpath component.
Updated Branches:
refs/heads/master c4f236e8e - a1ed6ef3e
CAMEL-6238: camel-jsonpath component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1ed6ef3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1ed6ef3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1ed6ef3
Branch: refs/heads/master
Commit: a1ed6ef3e33e98224650664979a588c42e02e813
Parents: c4f236e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:46:47 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:46:47 2013 +0200
--
.../main/java/org/apache/camel/builder/ExpressionClause.java | 6 +++---
.../java/org/apache/camel/builder/ExpressionClauseSupport.java | 4 ++--
.../test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java | 4 ++--
.../java/org/apache/camel/jsonpath/JsonPathTransformTest.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 07ab027..81fd32f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -278,14 +278,14 @@ public class ExpressionClauseT extends
ExpressionDefinition {
/**
* Evaluates a a
- * href=http://camel.apache.org/jsonpath.html;JSon Path
+ * href=http://camel.apache.org/jsonpath.html;Json Path
* expression/a
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
-public T jsonPath(String text) {
-return delegate.jsonPath(text);
+public T jsonpath(String text) {
+return delegate.jsonpath(text);
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 64955c2..763b8e2 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -313,13 +313,13 @@ public class ExpressionClauseSupportT {
}
/**
- * Evaluates a a href=http://camel.apache.org/jsonpath.html;JSon Path
+ * Evaluates a a href=http://camel.apache.org/jsonpath.html;Json Path
* expression/a
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
-public T jsonPath(String text) {
+public T jsonpath(String text) {
return expression(new JsonPathExpression(text));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
index cb9f51c..358c173 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -31,9 +31,9 @@ public class JsonPathCBRTest extends CamelTestSupport {
public void configure() throws Exception {
from(direct:start)
.choice()
-.when().jsonPath($.store.book[?(@.price 10)])
+.when().jsonpath($.store.book[?(@.price 10)])
.to(mock:cheap)
-.when().jsonPath($.store.book[?(@.price 30)])
+.when().jsonpath($.store.book[?(@.price 30)])
.to(mock:average)
.otherwise()
.to(mock:expensive);
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
