You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/24 06:12:16 UTC
[camel] branch master updated: CAMEL-16389 - Remove json-smart
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b59a96d CAMEL-16389 - Remove json-smart
b59a96d is described below
commit b59a96ddf1ba647b979f937f5bd956bba32173ee
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 23 12:49:44 2021 +0000
CAMEL-16389 - Remove json-smart
---
camel-dependencies/pom.xml | 1 -
components/camel-chunk/pom.xml | 5 -----
components/camel-jsonpath/pom.xml | 9 +++++++--
.../src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java | 4 ++++
.../java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java | 7 ++++++-
parent/pom.xml | 1 -
6 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a485e98..f8cc99a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -361,7 +361,6 @@
<json-path-version>2.4.0</json-path-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>
<json-simple-version>1.1.1</json-simple-version>
- <json-smart-version>2.3</json-smart-version>
<jsonassert-version>1.5.0</jsonassert-version>
<jsonata4java-version>1.5.0</jsonata4java-version>
<jsoup-version>1.13.1</jsoup-version>
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index 41f63c1..71bc279 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -46,11 +46,6 @@
<version>${chunk-templates-version}</version>
</dependency>
<dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>${json-smart-version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io-version}</version>
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 60f2aa8..7007ab7 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import>
- com.fasterxml.jackson.databind;resolution:=optional,
+ com.fasterxml.jackson.databind,
com.fasterxml.jackson.module.jaxb;resolution:=optional,
*
</camel.osgi.import>
@@ -55,11 +55,16 @@
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${json-path-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
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 40be969..d64eca0f 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
@@ -30,6 +30,8 @@ import java.util.regex.Pattern;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option;
+import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
@@ -72,6 +74,8 @@ public class JsonPathEngine {
if (options != null) {
builder.options(options);
}
+ builder.jsonProvider(new JacksonJsonProvider());
+ builder.mappingProvider(new JacksonMappingProvider());
if (suppressExceptions) {
builder.options(SUPPRESS_EXCEPTIONS);
}
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
index 7c2230f..61af6ea 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
@@ -21,6 +21,8 @@ import java.util.List;
import java.util.Map;
import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -47,7 +49,10 @@ public class JsonPathMapTransformTest extends CamelTestSupport {
getMockEndpoint("mock:authors").expectedMessageCount(1);
// should be a map
- Object document = Configuration.defaultConfiguration().jsonProvider()
+ Configuration.ConfigurationBuilder builder = Configuration.builder();
+ builder.jsonProvider(new JacksonJsonProvider());
+ builder.mappingProvider(new JacksonMappingProvider());
+ Object document = builder.build().jsonProvider()
.parse(new FileInputStream("src/test/resources/books.json"), "utf-8");
assertIsInstanceOf(Map.class, document);
diff --git a/parent/pom.xml b/parent/pom.xml
index 168d6b12..0603fe8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -345,7 +345,6 @@
<jsonassert-version>1.5.0</jsonassert-version>
<json-path-version>2.4.0</json-path-version>
<json-simple-version>1.1.1</json-simple-version>
- <json-smart-version>2.3</json-smart-version>
<jsonata4java-version>1.5.0</jsonata4java-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>
<jsoup-version>1.13.1</jsoup-version>