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 2013/10/06 12:42:38 UTC
[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 <da...@apache.org>
Authored: Sun Oct 6 11:26:44 2013 +0200
Committer: Claus Ibsen <da...@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 0000000..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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.12.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-jsonpath</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: JSon Path</name>
+ <description>Camel JSON Path Language</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.jsonpath.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=jsonpath</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>${json-path-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</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 0000000..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
+ * 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.io.IOException;
+import java.io.InputStream;
+
+import com.jayway.jsonpath.JsonPath;
+
+public class JsonPathExpression {
+
+ private final String expression;
+ private final JsonPath path;
+
+ public JsonPathExpression(String expression) {
+ this.expression = expression;
+ this.path = JsonPath.compile(expression);
+ }
+
+ public Object evaluate(InputStream json) throws IOException {
+ Object result = path.read(json);
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/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
new file mode 100644
index 0000000..23d0c3e
--- /dev/null
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
@@ -0,0 +1,64 @@
+/**
+ * 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.io.InputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Predicate;
+import org.apache.camel.support.ExpressionAdapter;
+import org.apache.camel.support.LanguageSupport;
+
+public class JsonPathLanguage extends LanguageSupport {
+
+ @Override
+ public Predicate createPredicate(final String predicate) {
+ return new ExpressionAdapter() {
+ @Override
+ public Object evaluate(Exchange exchange) {
+ try {
+ return evaluateJsonPath(exchange, predicate);
+ } catch (Exception e) {
+ throw new RuntimeException("TODO", e);
+ }
+ }
+ };
+ }
+
+ @Override
+ public Expression createExpression(final String expression) {
+ return new ExpressionAdapter() {
+ @Override
+ public Object evaluate(Exchange exchange) {
+ try {
+ return evaluateJsonPath(exchange, expression);
+ } catch (Exception e) {
+ throw new RuntimeException("TODO", e);
+ }
+ }
+ };
+ }
+
+ private Object evaluateJsonPath(Exchange exchange, String expression) throws Exception {
+ InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+ JsonPathExpression exp = new JsonPathExpression(expression);
+ Object result = exp.evaluate(is);
+ return result;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/main/resources/META-INF/LICENSE.txt b/components/camel-jsonpath/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-jsonpath/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/main/resources/META-INF/NOTICE.txt b/components/camel-jsonpath/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-jsonpath/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/main/resources/META-INF/services/org/apache/camel/language/jsonpath
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/main/resources/META-INF/services/org/apache/camel/language/jsonpath b/components/camel-jsonpath/src/main/resources/META-INF/services/org/apache/camel/language/jsonpath
new file mode 100644
index 0000000..85b246f
--- /dev/null
+++ b/components/camel-jsonpath/src/main/resources/META-INF/services/org/apache/camel/language/jsonpath
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.jsonpath.JsonPathLanguage
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/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
new file mode 100644
index 0000000..2c39998
--- /dev/null
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -0,0 +1,77 @@
+/**
+ * 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.io.File;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JsonPathCBRTest extends CamelTestSupport {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .choice()
+ .when().language("jsonpath", "$.store.book[?(@.price < 10)]")
+ .to("mock:cheap")
+ .when().language("jsonpath", "$.store.book[?(@.price < 30)]")
+ .to("mock:average")
+ .otherwise()
+ .to("mock:expensive");
+ }
+ };
+ }
+
+ @Test
+ public void testCheap() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(1);
+ getMockEndpoint("mock:average").expectedMessageCount(0);
+ getMockEndpoint("mock:expensive").expectedMessageCount(0);
+
+ template.sendBody("direct:start", new File("src/test/resources/cheap.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testAverage() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(0);
+ getMockEndpoint("mock:average").expectedMessageCount(1);
+ getMockEndpoint("mock:expensive").expectedMessageCount(0);
+
+ template.sendBody("direct:start", new File("src/test/resources/average.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testExpensive() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(0);
+ getMockEndpoint("mock:average").expectedMessageCount(0);
+ getMockEndpoint("mock:expensive").expectedMessageCount(1);
+
+ template.sendBody("direct:start", new File("src/test/resources/expensive.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
new file mode 100644
index 0000000..b606fa5
--- /dev/null
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
@@ -0,0 +1,67 @@
+/**
+ * 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.io.File;
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Predicate;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.spi.Language;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JsonPathLanguageTest extends CamelTestSupport {
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Test
+ public void testExpression() throws Exception {
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getIn().setBody(new File("src/test/resources/books.json"));
+
+ Language lan = context.resolveLanguage("jsonpath");
+ Expression exp = lan.createExpression("$.store.book[*].author");
+ List authors = exp.evaluate(exchange, List.class);
+ log.info("Authors {}", authors);
+
+ assertNotNull(authors);
+ assertEquals(2, authors.size());
+ assertEquals("Nigel Rees", authors.get(0));
+ assertEquals("Evelyn Waugh", authors.get(1));
+ }
+
+ @Test
+ public void testPredicate() throws Exception {
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getIn().setBody(new File("src/test/resources/books.json"));
+
+ Language lan = context.resolveLanguage("jsonpath");
+ Predicate pre = lan.createPredicate("$.store.book[?(@.price < 10)]");
+ boolean cheap = pre.matches(exchange);
+ assertTrue("Should have cheap books", cheap);
+
+ pre = lan.createPredicate("$.store.book[?(@.price > 30)]");
+ boolean expensive = pre.matches(exchange);
+ assertFalse("Should not have expensive books", expensive);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/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 b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
new file mode 100644
index 0000000..b8a56fc
--- /dev/null
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
@@ -0,0 +1,53 @@
+/**
+ * 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.io.File;
+import java.util.List;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JsonPathTransformTest extends CamelTestSupport {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .transform().language("jsonpath", "$.store.book[*].author")
+ .to("mock:authors");
+ }
+ };
+ }
+
+ @Test
+ public void testAuthors() throws Exception {
+ getMockEndpoint("mock:authors").expectedMessageCount(1);
+
+ template.sendBody("direct:start", new File("src/test/resources/books.json"));
+
+ assertMockEndpointsSatisfied();
+
+ List authors = getMockEndpoint("mock:authors").getReceivedExchanges().get(0).getIn().getBody(List.class);
+ assertEquals("Nigel Rees", authors.get(0));
+ assertEquals("Evelyn Waugh", authors.get(1));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/resources/average.json
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/average.json b/components/camel-jsonpath/src/test/resources/average.json
new file mode 100644
index 0000000..51a45ba
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/average.json
@@ -0,0 +1,16 @@
+{ "store": {
+ "book": [
+ {
+ "category": "fiction",
+ "author": "Evelyn Waugh",
+ "title": "Sword of Honour",
+ "price": 12.99,
+ "isbn": "0-553-21311-3"
+ }
+ ],
+ "bicycle": {
+ "color": "red",
+ "price": 19.95
+ }
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/resources/books.json
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/books.json b/components/camel-jsonpath/src/test/resources/books.json
new file mode 100644
index 0000000..c06af59
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/books.json
@@ -0,0 +1,22 @@
+{ "store": {
+ "book": [
+ {
+ "category": "reference",
+ "author": "Nigel Rees",
+ "title": "Sayings of the Century",
+ "price": 8.95
+ },
+ {
+ "category": "fiction",
+ "author": "Evelyn Waugh",
+ "title": "Sword of Honour",
+ "price": 12.99,
+ "isbn": "0-553-21311-3"
+ }
+ ],
+ "bicycle": {
+ "color": "red",
+ "price": 19.95
+ }
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/resources/cheap.json
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/cheap.json b/components/camel-jsonpath/src/test/resources/cheap.json
new file mode 100644
index 0000000..9ffb356
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/cheap.json
@@ -0,0 +1,15 @@
+{ "store": {
+ "book": [
+ {
+ "category": "reference",
+ "author": "Nigel Rees",
+ "title": "Sayings of the Century",
+ "price": 8.95
+ }
+ ],
+ "bicycle": {
+ "color": "red",
+ "price": 19.95
+ }
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/resources/expensive.json
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/expensive.json b/components/camel-jsonpath/src/test/resources/expensive.json
new file mode 100644
index 0000000..8ebe734
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/expensive.json
@@ -0,0 +1,16 @@
+{ "store": {
+ "book": [
+ {
+ "category": "programming",
+ "author": "Claus Ibsen,Jonathan Anstey",
+ "title": "Camel in Action",
+ "price": 39.99,
+ "isbn": "978-193-518-236-8"
+ }
+ ],
+ "bicycle": {
+ "color": "red",
+ "price": 19.95
+ }
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/log4j.properties b/components/camel-jsonpath/src/test/resources/log4j.properties
new file mode 100644
index 0000000..e0d8ff0
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, file
+
+# uncomment this to turn on debug of camel
+#log4j.logger.org.apache.camel.jsonpath=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-jsonpath-test.log
+log4j.appender.file.append=true
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 3ef980b..57cc1e4 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -112,6 +112,7 @@
<module>camel-jmx</module>
<module>camel-josql</module>
<module>camel-jpa</module>
+ <module>camel-jsonpath</module>
<module>camel-jsch</module>
<module>camel-jt400</module>
<module>camel-juel</module>
@@ -242,4 +243,4 @@
</dependencies>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 701463e..5f5c049 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,6 +235,7 @@
<jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
<jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
<jsonlib-version>2.4</jsonlib-version>
+ <json-path-version>0.9.0</json-path-version>
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
<jt400-version>6.7</jt400-version>
[2/3] git commit: CAMEL-6238: camel-jsonpath component.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Sun Oct 6 11:53:16 2013 +0200
Committer: Claus Ibsen <da...@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 ExpressionClause<T> 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 ExpressionClauseSupport<T> {
}
/**
+ * 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 0000000..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 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.model.language;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * For JSonPath expressions and predicates
+ *
+ * @version
+ */
+@XmlRootElement(name = "jsonpath")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class JsonPathExpression extends ExpressionDefinition {
+
+ public JsonPathExpression() {
+ }
+
+ public JsonPathExpression(String expression) {
+ super(expression);
+ }
+
+ public String getLanguage() {
+ return "jsonpath";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
----------------------------------------------------------------------
diff --git a/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
index d558d31..7dce959 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
@@ -20,6 +20,7 @@ ExpressionDefinition
GroovyExpression
HeaderExpression
JavaScriptExpression
+JsonPathExpression
JXPathExpression
LanguageExpression
MethodCallExpression
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/components/camel-jsonpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 670f266..22033a8 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
- <version>2.12.2-SNAPSHOT</version>
+ <version>2.13-SNAPSHOT</version>
</parent>
<artifactId>camel-jsonpath</artifactId>
@@ -49,7 +49,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/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
new file mode 100644
index 0000000..48bde5c
--- /dev/null
+++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
@@ -0,0 +1,37 @@
+/**
+ * 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.io.IOException;
+import java.io.InputStream;
+
+import com.jayway.jsonpath.JsonPath;
+
+public class JSonPathEngine {
+
+ private final String expression;
+ private final JsonPath path;
+
+ public JSonPathEngine(String expression) {
+ this.expression = expression;
+ this.path = JsonPath.compile(expression);
+ }
+
+ public Object read(InputStream json) throws IOException {
+ return path.read(json);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/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
deleted file mode 100644
index 8d39e7c..0000000
--- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 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.io.IOException;
-import java.io.InputStream;
-
-import com.jayway.jsonpath.JsonPath;
-
-public class JsonPathExpression {
-
- private final String expression;
- private final JsonPath path;
-
- public JsonPathExpression(String expression) {
- this.expression = expression;
- this.path = JsonPath.compile(expression);
- }
-
- public Object evaluate(InputStream json) throws IOException {
- Object result = path.read(json);
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/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 23d0c3e..9776f77 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
@@ -20,21 +20,31 @@ import java.io.InputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionEvaluationException;
+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 {
@Override
public Predicate createPredicate(final String predicate) {
+ final JSonPathEngine engine;
+ try {
+ engine = new JSonPathEngine(predicate);
+ } catch (Exception e) {
+ throw new ExpressionIllegalSyntaxException(predicate, e);
+ }
+
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
try {
- return evaluateJsonPath(exchange, predicate);
+ return evaluateJsonPath(exchange, engine);
} catch (Exception e) {
- throw new RuntimeException("TODO", e);
+ throw new ExpressionEvaluationException(this, exchange, e);
}
}
};
@@ -42,23 +52,32 @@ public class JsonPathLanguage extends LanguageSupport {
@Override
public Expression createExpression(final String expression) {
+ final JSonPathEngine engine;
+ try {
+ engine = new JSonPathEngine(expression);
+ } catch (Exception e) {
+ throw new ExpressionIllegalSyntaxException(expression, e);
+ }
+
return new ExpressionAdapter() {
@Override
public Object evaluate(Exchange exchange) {
try {
- return evaluateJsonPath(exchange, expression);
+ return evaluateJsonPath(exchange, engine);
} catch (Exception e) {
- throw new RuntimeException("TODO", e);
+ throw new ExpressionEvaluationException(this, exchange, e);
}
}
};
}
- private Object evaluateJsonPath(Exchange exchange, String expression) throws Exception {
+ private Object evaluateJsonPath(Exchange exchange, JSonPathEngine engine) throws Exception {
InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
- JsonPathExpression exp = new JsonPathExpression(expression);
- Object result = exp.evaluate(is);
- return result;
+ try {
+ return engine.read(is);
+ } finally {
+ IOHelper.close(is);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/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 2c39998..cb9f51c 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().language("jsonpath", "$.store.book[?(@.price < 10)]")
+ .when().jsonPath("$.store.book[?(@.price < 10)]")
.to("mock:cheap")
- .when().language("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/794ee2c8/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 b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
index b8a56fc..1486ff4 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
@@ -31,7 +31,7 @@ public class JsonPathTransformTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start")
- .transform().language("jsonpath", "$.store.book[*].author")
+ .transform().jsonPath("$.store.book[*].author")
.to("mock:authors");
}
};
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
new file mode 100644
index 0000000..32aeb57
--- /dev/null
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
@@ -0,0 +1,65 @@
+/**
+ * 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.io.File;
+
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringJsonPathCBRTest extends CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/jsonpath/SpringJsonPathCBTTest.xml");
+ }
+
+ @Test
+ public void testCheap() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(1);
+ getMockEndpoint("mock:average").expectedMessageCount(0);
+ getMockEndpoint("mock:expensive").expectedMessageCount(0);
+
+ template.sendBody("direct:start", new File("src/test/resources/cheap.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testAverage() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(0);
+ getMockEndpoint("mock:average").expectedMessageCount(1);
+ getMockEndpoint("mock:expensive").expectedMessageCount(0);
+
+ template.sendBody("direct:start", new File("src/test/resources/average.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testExpensive() throws Exception {
+ getMockEndpoint("mock:cheap").expectedMessageCount(0);
+ getMockEndpoint("mock:average").expectedMessageCount(0);
+ getMockEndpoint("mock:expensive").expectedMessageCount(1);
+
+ template.sendBody("direct:start", new File("src/test/resources/expensive.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
new file mode 100644
index 0000000..49c6ec8
--- /dev/null
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
@@ -0,0 +1,46 @@
+/**
+ * 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.io.File;
+import java.util.List;
+
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringJsonPathTransformTest extends CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/jsonpath/SpringJsonPathTransformTest.xml");
+ }
+
+ @Test
+ public void testAuthors() throws Exception {
+ getMockEndpoint("mock:authors").expectedMessageCount(1);
+
+ template.sendBody("direct:start", new File("src/test/resources/books.json"));
+
+ assertMockEndpointsSatisfied();
+
+ List authors = getMockEndpoint("mock:authors").getReceivedExchanges().get(0).getIn().getBody(List.class);
+ assertEquals("Nigel Rees", authors.get(0));
+ assertEquals("Evelyn Waugh", authors.get(1));
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathCBTTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathCBTTest.xml b/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathCBTTest.xml
new file mode 100644
index 0000000..514e542
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathCBTTest.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:start"/>
+ <choice>
+ <when>
+ <jsonpath>$.store.book[?(@.price < 10)]</jsonpath>
+ <to uri="mock:cheap"/>
+ </when>
+ <when>
+ <jsonpath>$.store.book[?(@.price < 30)]</jsonpath>
+ <to uri="mock:average"/>
+ </when>
+ <otherwise>
+ <to uri="mock:expensive"/>
+ </otherwise>
+ </choice>
+ </route>
+ </camelContext>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathTransformTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathTransformTest.xml b/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathTransformTest.xml
new file mode 100644
index 0000000..e684735
--- /dev/null
+++ b/components/camel-jsonpath/src/test/resources/org/apache/camel/jsonpath/SpringJsonPathTransformTest.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:start"/>
+ <transform>
+ <jsonpath>$.store.book[*].author</jsonpath>
+ </transform>
+ <to uri="mock:authors"/>
+ </route>
+ </camelContext>
+
+</beans>
\ No newline at end of file
[3/3] git commit: CAMEL-6238: camel-jsonpath component.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Sun Oct 6 12:41:10 2013 +0200
Committer: Claus Ibsen <da...@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>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jsonpath</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-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 @@
<include>org.apache.camel:camel-josql</include>
<include>org.apache.camel:camel-jpa</include>
<include>org.apache.camel:camel-jsch</include>
+ <include>org.apache.camel:camel-jsonpath</include>
<include>org.apache.camel:camel-jt400</include>
<include>org.apache.camel:camel-juel</include>
<include>org.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 0000000..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-version>2.4_1</jsonlib-bundle-version>
<jsonlib-version>2.4</jsonlib-version>
<json-path-version>0.9.0</json-path-version>
+ <json-smart-version>1.2</json-smart-version>
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
<jt400-version>6.7</jt400-version>
@@ -838,6 +839,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jsonpath</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jt400</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index e7f59ed..c88f011 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -607,6 +607,11 @@
<feature version='${project.version}'>camel-ftp</feature>
<bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
</feature>
+ <feature name='camel-jsonpath' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle>mvn:com.jayway.jsonpath/json-path/${json-path-version}</bundle>
+ <bundle>mvn:net.minidev/json-smart/${json-smart-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-jsonpath/${project.version}</bundle>
+ </feature>
<feature name='camel-jt400' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-25-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>