CAMEL-16389 - Remove json-smart

apache · Mar 24, 2021 · b59a96d · b59a96d
1 parent 64c3abf
commit b59a96d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git 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
@@ -45,11 +45,6 @@
             <artifactId>chunk-templates</artifactId>
             <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>

diff --git 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
@@ -30,6 +30,8 @@
 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 JsonPathEngine(String expression, boolean writeAsString, boolean suppress
         if (options != null) {
             builder.options(options);
         }
+        builder.jsonProvider(new JacksonJsonProvider());
+        builder.mappingProvider(new JacksonMappingProvider());
         if (suppressExceptions) {
             builder.options(SUPPRESS_EXCEPTIONS);
         }

diff --git a/...ents/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java b/...ents/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
@@ -21,6 +21,8 @@
 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 void testAuthors() throws Exception {
         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
@@ -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>