From 966abf9459861a0f91925860cbaf82e128d6c5db Mon Sep 17 00:00:00 2001
From: Baule A <65255151+baulea@users.noreply.github.com>
Date: Sat, 23 Mar 2024 19:43:15 +0100
Subject: [PATCH] introduce JsonPathJacksonProvider

---
 core/pom.xml                                  |  4 --
 .../di/provider/JsonPathJacksonProvider.java  | 37 +++++++++++++
 .../array/ArrayIsEmptyAsserterImpl.java       | 18 +++----
 .../array/ArraySizeAsserterImpl.java          | 26 ++++-----
 .../ZeroCodeAssertionsProcessorImpl.java      |  3 +-
 .../engine/sorter/ZeroCodeSorterImpl.java     | 54 ++++++++-----------
 .../validators/ZeroCodeValidatorImpl.java     | 22 ++++++--
 .../kafka/helper/KafkaProducerHelper.java     | 41 +++++++-------
 .../converter/MimeTypeConverterTest.java      | 19 ++++---
 .../ZeroCodeAssertionsProcessorImplTest.java  | 31 ++++++-----
 .../engine/sorter/ZeroCodeSorterImplTest.java |  9 ++--
 .../validators/ZeroCodeValidatorImplTest.java | 12 +++--
 pom.xml                                       |  5 --
 13 files changed, 160 insertions(+), 121 deletions(-)
 create mode 100644 core/src/main/java/org/jsmart/zerocode/core/di/provider/JsonPathJacksonProvider.java

diff --git a/core/pom.xml b/core/pom.xml
index f27010150..6debd337a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,10 +110,6 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.minidev</groupId>
-            <artifactId>json-smart</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.classpath-explorer</groupId>
diff --git a/core/src/main/java/org/jsmart/zerocode/core/di/provider/JsonPathJacksonProvider.java b/core/src/main/java/org/jsmart/zerocode/core/di/provider/JsonPathJacksonProvider.java
new file mode 100644
index 000000000..867571a63
--- /dev/null
+++ b/core/src/main/java/org/jsmart/zerocode/core/di/provider/JsonPathJacksonProvider.java
@@ -0,0 +1,37 @@
+package org.jsmart.zerocode.core.di.provider;
+
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.Option;
+import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.json.JsonProvider;
+import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
+import com.jayway.jsonpath.spi.mapper.MappingProvider;
+import jakarta.inject.Provider;
+import java.util.EnumSet;
+import java.util.Set;
+
+public class JsonPathJacksonProvider implements Provider<Configuration.Defaults> {
+    @Override
+    public Configuration.Defaults get() {
+        return new Configuration.Defaults() {
+
+            private final JsonProvider jsonProvider = new JacksonJsonProvider();
+            private final MappingProvider mappingProvider = new JacksonMappingProvider();
+
+            @Override
+            public JsonProvider jsonProvider() {
+                return jsonProvider;
+            }
+
+            @Override
+            public MappingProvider mappingProvider() {
+                return mappingProvider;
+            }
+
+            @Override
+            public Set<Option> options() {
+                return EnumSet.noneOf(Option.class);
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArrayIsEmptyAsserterImpl.java b/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArrayIsEmptyAsserterImpl.java
index dc0814259..d3214bca4 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArrayIsEmptyAsserterImpl.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArrayIsEmptyAsserterImpl.java
@@ -1,10 +1,11 @@
 
 package org.jsmart.zerocode.core.engine.assertion.array;
 
-import net.minidev.json.JSONArray;
 import org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher;
 import org.jsmart.zerocode.core.engine.assertion.JsonAsserter;
 
+import java.util.List;
+
 import static org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher.aMatchingMessage;
 import static org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher.aNotMatchingMessage;
 
@@ -27,21 +28,14 @@ public Object getExpected() {
 
     @Override
     public FieldAssertionMatcher actualEqualsToExpected(Object result) {
-        if(result instanceof JSONArray){
-
-            final JSONArray actualArrayValue = (JSONArray) result;
-
-            if(actualArrayValue.isEmpty()){
+        if (result instanceof List<?>) {
+            List<?> list = (List<?>) result;
 
+            if (list.isEmpty()) {
                 return aMatchingMessage();
             }
 
-            return aNotMatchingMessage(path, "[]", result);
-
-        } else {
-
-            return aNotMatchingMessage(path, "[]", result);
-
         }
+        return aNotMatchingMessage(path, "[]", result);
     }
 }
diff --git a/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArraySizeAsserterImpl.java b/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArraySizeAsserterImpl.java
index eef6c1a7b..65ac8ebca 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArraySizeAsserterImpl.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/engine/assertion/array/ArraySizeAsserterImpl.java
@@ -1,10 +1,11 @@
 
 package org.jsmart.zerocode.core.engine.assertion.array;
 
-import net.minidev.json.JSONArray;
 import org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher;
 import org.jsmart.zerocode.core.engine.assertion.JsonAsserter;
 
+import java.util.List;
+
 import static org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher.aMatchingMessage;
 import static org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher.aNotMatchingMessage;
 import static org.jsmart.zerocode.core.engine.tokens.ZeroCodeAssertionTokens.ASSERT_VALUE_EQUAL_TO_NUMBER;
@@ -41,17 +42,16 @@ public Object getExpected() {
 
     @Override
     public FieldAssertionMatcher actualEqualsToExpected(Object result) {
-        if (result instanceof JSONArray) {
-
-            final JSONArray actualArrayValue = (JSONArray) result;
+        if (result instanceof List<?>) {
+            List<?> list = (List<?>) result;
 
             if (this.expectedSize == -1 && this.expectedSizeExpression != null) {
 
-                return processRelationalExpression(actualArrayValue);
+                return processRelationalExpression(list);
 
             }
 
-            if (actualArrayValue.size() == this.expectedSize) {
+            if (list.size() == this.expectedSize) {
 
                 return aMatchingMessage();
             }
@@ -59,7 +59,7 @@ public FieldAssertionMatcher actualEqualsToExpected(Object result) {
             return aNotMatchingMessage(
                     path,
                     String.format("Array of size %d", expectedSize),
-                    actualArrayValue.size());
+                    list.size());
 
         } else {
 
@@ -68,25 +68,25 @@ public FieldAssertionMatcher actualEqualsToExpected(Object result) {
         }
     }
 
-    public FieldAssertionMatcher processRelationalExpression(JSONArray actualArrayValue) {
+    public FieldAssertionMatcher processRelationalExpression(List<?> list) {
         if (expectedSizeExpression.startsWith(ASSERT_VALUE_GREATER_THAN)) {
             String greaterThan = this.expectedSizeExpression.substring(ASSERT_VALUE_GREATER_THAN.length());
-            if (actualArrayValue.size() > Integer.parseInt(greaterThan)) {
+            if (list.size() > Integer.parseInt(greaterThan)) {
                 return aMatchingMessage();
             }
         } else if (expectedSizeExpression.startsWith(ASSERT_VALUE_LESSER_THAN)) {
             String lesserThan = this.expectedSizeExpression.substring(ASSERT_VALUE_LESSER_THAN.length());
-            if (actualArrayValue.size() < Integer.parseInt(lesserThan)) {
+            if (list.size() < Integer.parseInt(lesserThan)) {
                 return aMatchingMessage();
             }
         } else if (expectedSizeExpression.startsWith(ASSERT_VALUE_EQUAL_TO_NUMBER)) {
             String equalTo = this.expectedSizeExpression.substring(ASSERT_VALUE_EQUAL_TO_NUMBER.length());
-            if (actualArrayValue.size() == Integer.parseInt(equalTo)) {
+            if (list.size() == Integer.parseInt(equalTo)) {
                 return aMatchingMessage();
             }
         } else if (expectedSizeExpression.startsWith(ASSERT_VALUE_NOT_EQUAL_TO_NUMBER)) {
             String notEqualTo = this.expectedSizeExpression.substring(ASSERT_VALUE_NOT_EQUAL_TO_NUMBER.length());
-            if (actualArrayValue.size() != Integer.parseInt(notEqualTo)) {
+            if (list.size() != Integer.parseInt(notEqualTo)) {
                 return aMatchingMessage();
             }
         }
@@ -94,7 +94,7 @@ public FieldAssertionMatcher processRelationalExpression(JSONArray actualArrayVa
         return aNotMatchingMessage(
                 path,
                 String.format("Array of size %s", expectedSizeExpression),
-                actualArrayValue.size());
+                list.size());
     }
 
 
diff --git a/core/src/main/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImpl.java b/core/src/main/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImpl.java
index 4a7b46123..a200449eb 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImpl.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImpl.java
@@ -8,7 +8,6 @@
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import com.jayway.jsonpath.JsonPath;
-import net.minidev.json.JSONArray;
 import org.apache.commons.text.StringSubstitutor;
 import org.jsmart.zerocode.core.domain.Step;
 import org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher;
@@ -442,7 +441,7 @@ private LocalDateTime parseLocalDateTime(String value) {
     }
 
     boolean isPathValueJson(Object jsonPathValue) {
-        return jsonPathValue instanceof LinkedHashMap || jsonPathValue instanceof JSONArray;
+        return jsonPathValue instanceof LinkedHashMap || jsonPathValue instanceof List<?>;
     }
 
     void resolveLeafOnlyNodeValue(String scenarioState, Map<String, String> paramMap, String thisPath) {
diff --git a/core/src/main/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImpl.java b/core/src/main/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImpl.java
index ea6eba51d..60825851d 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImpl.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImpl.java
@@ -5,8 +5,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.jayway.jsonpath.JsonPath;
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
 import org.jsmart.zerocode.core.domain.Step;
 import org.jsmart.zerocode.core.engine.preprocessor.ZeroCodeAssertionsProcessor;
 import org.slf4j.Logger;
@@ -52,43 +50,37 @@ public String sortArrayAndReplaceInResponse(Step thisStep, String results, Strin
         //
         String transformedPath = zeroCodeAssertionsProcessor.resolveStringJson(path,
                 resolvedScenarioState);
-        Object result = getArrayToSort(transformedPath, results);
+        
+        List<?> listToSort = JsonPath.parse(results).read(transformedPath, List.class);
+        // sorting passed array
+        List<Map<?, ?>> sortedList = sortList(listToSort, key, order);
+        return replaceArrayWithSorted(results, transformedPath, sortedList);
 
-        if (result instanceof JSONArray) {
-            JSONArray arrayToSort = (JSONArray) result;
-
-            // sorting passed array
-            JSONArray sortedArray = sortArray(arrayToSort, key, order);
-            return replaceArrayWithSorted(results, transformedPath, sortedArray);
-        } else {
-            throw new RuntimeException("Can't sort not an array");
-        }
     }
 
-    private JSONArray sortArray(JSONArray arrayToSort, String key, String order) {
-        JSONArray sortedJsonArray = new JSONArray();
 
-        List<Map<String, ?>> jsonValues = new ArrayList<>();
+    private List<Map<?, ?>> sortList(List<?> arrayToSort, String key, String order) {
+        List<Map<?, ?>> jsonValues = new ArrayList<>();
         for (Object o : arrayToSort) {
-            jsonValues.add((Map<String, ?>) o);
+            if (o instanceof Map<?, ?>) {
+                Map<?, ?> map = (Map<?, ?>) o;
+                jsonValues.add(map);
+            } else {
+                LOGGER.error("list item is no map and ignored during sort: {}", o);
+            }
         }
-
         jsonValues.sort((a, b) -> {
-            Comparable valA;
-            Comparable valB;
-
             try {
-                valA = (Comparable) a.get(key);
-                valB = (Comparable) b.get(key);
-            } catch (Exception e) {
-                LOGGER.error("Objects can't be compared" + e);
+                Comparable valA = (Comparable<?>) a.get(key);
+                Comparable valB = (Comparable<?>) b.get(key);
+                return order.equalsIgnoreCase(SortOrder.NATURAL.getValue()) ? valA.compareTo(valB)
+                        : -valA.compareTo(valB);
+            } catch (ClassCastException e) {
+                LOGGER.error("Objects can't be compared", e);
                 throw new RuntimeException("Objects can't be compared", e.getCause());
             }
-            return order.equalsIgnoreCase(SortOrder.NATURAL.getValue()) ? valA.compareTo(valB)
-                    : -valA.compareTo(valB);
         });
-        sortedJsonArray.addAll(jsonValues);
-        return sortedJsonArray;
+        return jsonValues;
     }
 
     private Map<String, String> convertToMap(String value) {
@@ -101,11 +93,7 @@ private Map<String, String> convertToMap(String value) {
         }
     }
 
-    public Object getArrayToSort(String path, String results) {
-        return JsonPath.read(results, path);
-    }
-
-    public String replaceArrayWithSorted(String results, String path, Object sortedArray) {
+    private String replaceArrayWithSorted(String results, String path, Object sortedArray) {
         return JsonPath.parse(results).set(path, sortedArray).jsonString();
     }
 
diff --git a/core/src/main/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImpl.java b/core/src/main/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImpl.java
index 7a96fe13f..759bd3126 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImpl.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImpl.java
@@ -1,10 +1,13 @@
 package org.jsmart.zerocode.core.engine.validators;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
-import java.util.ArrayList;
-import java.util.List;
+import org.jsmart.zerocode.core.di.provider.JsonPathJacksonProvider;
+import org.jsmart.zerocode.core.di.provider.ObjectMapperProvider;
 import org.jsmart.zerocode.core.domain.Step;
 import org.jsmart.zerocode.core.domain.Validator;
 import org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher;
@@ -12,6 +15,9 @@
 import org.jsmart.zerocode.core.engine.preprocessor.ZeroCodeAssertionsProcessor;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.jsmart.zerocode.core.utils.HelperJsonUtils.strictComparePayload;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -20,9 +26,13 @@ public class ZeroCodeValidatorImpl implements ZeroCodeValidator {
 
     private final ZeroCodeAssertionsProcessor zeroCodeAssertionsProcessor;
 
+    private final ObjectMapper mapper;
+
     @Inject
     public ZeroCodeValidatorImpl(ZeroCodeAssertionsProcessor zeroCodeAssertionsProcessor) {
         this.zeroCodeAssertionsProcessor = zeroCodeAssertionsProcessor;
+        this.mapper = new ObjectMapperProvider().get();
+        Configuration.setDefaults(new JsonPathJacksonProvider().get());
     }
 
     @Override
@@ -40,10 +50,16 @@ public List<FieldAssertionMatcher> validateFlat(Step thisStep, String actualResu
             JsonNode expectedValue = validator.getValue();
 
             Object actualValue = JsonPath.read(actualResult, transformed);
+            String actualString;
+            try {
+                actualString = this.mapper.writeValueAsString(actualValue);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
 
             List<JsonAsserter> asserters = zeroCodeAssertionsProcessor.createJsonAsserters(expectedValue.toString());
 
-            failureResults.addAll(zeroCodeAssertionsProcessor.assertAllAndReturnFailed(asserters, actualValue.toString()));
+            failureResults.addAll(zeroCodeAssertionsProcessor.assertAllAndReturnFailed(asserters, actualString));
         }
 
         return failureResults;
diff --git a/core/src/main/java/org/jsmart/zerocode/core/kafka/helper/KafkaProducerHelper.java b/core/src/main/java/org/jsmart/zerocode/core/kafka/helper/KafkaProducerHelper.java
index 7c4e0abb4..42421c1d1 100644
--- a/core/src/main/java/org/jsmart/zerocode/core/kafka/helper/KafkaProducerHelper.java
+++ b/core/src/main/java/org/jsmart/zerocode/core/kafka/helper/KafkaProducerHelper.java
@@ -1,17 +1,14 @@
 package org.jsmart.zerocode.core.kafka.helper;
 
-import static org.jsmart.zerocode.core.kafka.KafkaConstants.RAW;
-import static org.jsmart.zerocode.core.kafka.common.CommonConfigs.BOOTSTRAP_SERVERS;
-import static org.jsmart.zerocode.core.kafka.common.KafkaCommonUtils.resolveValuePlaceHolders;
-import static org.jsmart.zerocode.core.kafka.error.KafkaMessageConstants.NO_RECORD_FOUND_TO_SEND;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Properties;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.io.Resources;
+import com.google.gson.Gson;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import com.google.protobuf.Message.Builder;
+import com.google.protobuf.util.JsonFormat;
+import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -22,15 +19,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.io.Resources;
-import com.google.gson.Gson;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Message;
-import com.google.protobuf.Message.Builder;
-import com.google.protobuf.util.JsonFormat;
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.PathNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Properties;
+
+import static org.jsmart.zerocode.core.kafka.KafkaConstants.RAW;
+import static org.jsmart.zerocode.core.kafka.common.CommonConfigs.BOOTSTRAP_SERVERS;
+import static org.jsmart.zerocode.core.kafka.common.KafkaCommonUtils.resolveValuePlaceHolders;
+import static org.jsmart.zerocode.core.kafka.error.KafkaMessageConstants.NO_RECORD_FOUND_TO_SEND;
 
 public class KafkaProducerHelper {
     private static final Logger LOGGER = LoggerFactory.getLogger(KafkaProducerHelper.class);
diff --git a/core/src/test/java/org/jsmart/zerocode/converter/MimeTypeConverterTest.java b/core/src/test/java/org/jsmart/zerocode/converter/MimeTypeConverterTest.java
index ba06b4202..56c3d9546 100644
--- a/core/src/test/java/org/jsmart/zerocode/converter/MimeTypeConverterTest.java
+++ b/core/src/test/java/org/jsmart/zerocode/converter/MimeTypeConverterTest.java
@@ -2,30 +2,33 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
+import org.jsmart.zerocode.core.di.provider.JsonPathJacksonProvider;
 import org.jsmart.zerocode.core.di.provider.ObjectMapperProvider;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.apache.commons.text.StringEscapeUtils.escapeJava;
 import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
+import static org.apache.commons.text.StringEscapeUtils.escapeJava;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 public class MimeTypeConverterTest {
 
-    private ObjectMapper mapper = new ObjectMapperProvider().get();
+    private final ObjectMapper mapper = new ObjectMapperProvider().get();
 
     private Converter xmlToJsonConverter;
 
     @Before
-    public void setUpStuffs() throws Exception {
+    public void setUpStuffs() {
         xmlToJsonConverter = new MimeTypeConverter(mapper);
+        Configuration.setDefaults(new JsonPathJacksonProvider().get());
     }
 
     @Test
-    public void testXmlToJsonWithSingleQuote_willNotFail() throws Exception {
+    public void testXmlToJsonWithSingleQuote_willNotFail() {
 
         String xml = "<?xml version='1.0' encoding=\"UTF-8\"?><address>Street 123</address>";
         String escapedOut = escapeEcmaScript(xml);
@@ -180,12 +183,12 @@ public void testJsonArrayBlockToJson() throws Exception {
                 "            }\n" +
                 "        }";
 
-        String jsonArrayString = JsonPath.read(jsonBlockString, "$.addresses.address").toString();
-        System.out.println("--- jsonArray: \n" + jsonArrayString);
+        Object jsonPathValue = JsonPath.read(jsonBlockString, "$.addresses.address");
+        System.out.println("--- jsonArray: \n" + jsonPathValue.toString());
 
-        JsonNode jsonNodeInput = mapper.readTree(jsonArrayString);
+        JsonNode jsonNodeInput = this.mapper.valueToTree(jsonPathValue);
 
-        Object jsonNodeOutput = xmlToJsonConverter.jsonBlockToJson(jsonNodeInput);
+        Object jsonNodeOutput = this.xmlToJsonConverter.jsonBlockToJson(jsonNodeInput);
 
         System.out.println("--- jsonArrayBlockOutput:\n" + jsonNodeOutput);
 
diff --git a/core/src/test/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImplTest.java b/core/src/test/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImplTest.java
index e680c2720..90ee79980 100644
--- a/core/src/test/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImplTest.java
+++ b/core/src/test/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeAssertionsProcessorImplTest.java
@@ -6,14 +6,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
-import static com.jayway.jsonpath.JsonPath.read;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
 import org.hamcrest.core.Is;
 import org.jsmart.zerocode.TestUtility;
 import org.jsmart.zerocode.core.di.main.ApplicationMainModule;
+import org.jsmart.zerocode.core.di.provider.JsonPathJacksonProvider;
 import org.jsmart.zerocode.core.di.provider.ObjectMapperProvider;
 import org.jsmart.zerocode.core.domain.ScenarioSpec;
 import org.jsmart.zerocode.core.domain.Step;
@@ -21,12 +19,7 @@
 import org.jsmart.zerocode.core.engine.assertion.JsonAsserter;
 import org.jsmart.zerocode.core.engine.tokens.ZeroCodeValueTokens;
 import org.jsmart.zerocode.core.utils.SmartUtils;
-import static org.jsmart.zerocode.core.utils.SmartUtils.checkDigNeeded;
-import static org.jsmart.zerocode.core.utils.SmartUtils.readJsonAsString;
-import static org.jsmart.zerocode.core.utils.TokenUtils.getTestCaseTokens;
 import org.junit.Assert;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -37,6 +30,16 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.jayway.jsonpath.JsonPath.read;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.jsmart.zerocode.core.utils.SmartUtils.checkDigNeeded;
+import static org.jsmart.zerocode.core.utils.SmartUtils.readJsonAsString;
+import static org.jsmart.zerocode.core.utils.TokenUtils.getTestCaseTokens;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+
 public class ZeroCodeAssertionsProcessorImplTest {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
@@ -53,6 +56,7 @@ public void setUpStuff() throws Exception {
         injector = Guice.createInjector(new ApplicationMainModule(serverEnvFileName));
         smartUtils = injector.getInstance(SmartUtils.class);
         mapper = new ObjectMapperProvider().get();
+        Configuration.setDefaults(new JsonPathJacksonProvider().get());
         jsonPreProcessor =
                 new ZeroCodeAssertionsProcessorImpl(smartUtils.getMapper(), serverEnvFileName);
     }
@@ -1044,7 +1048,7 @@ public void testDateAfterBefore_fail_afterSameDate() throws Exception {
                         + "	\"status\": 200,\n"
                         + "	\"body\": {\n"
                         + "	    \"projectDetails\": {\n"
-                        + "	            \"startDateTime\": \"2015-09-14T09:49:34.000Z\",\n"
+                        + "	            \"startDateTime\": \"2015-09-14T09:49:34.000Z\"\n"
                         + "        }\n"
                         + "    }\n"
                         + "}";
@@ -1084,7 +1088,7 @@ public void testDateAfterBefore_fail_beforeSameDate() throws Exception {
                         + "	\"status\": 200,\n"
                         + "	\"body\": {\n"
                         + " 		\"projectDetails\": {\n"
-                        + "			\"startDateTime\": \"2015-09-14T09:49:34.000Z\",\n"
+                        + "			\"startDateTime\": \"2015-09-14T09:49:34.000Z\"\n"
                         + "		}\n"
                         + "	}\n"
                         + "}";
@@ -1512,10 +1516,9 @@ public void test_JSONCONTENT_stringArray() throws IOException {
 
         String result = "[\"test1\",\"test2\"]";
 
-        Object jsonPathValue = JsonPath.read(jsonResult,
-            "$.request.body.names");
+        Object jsonPathValue = JsonPath.parse(jsonResult).read("$.request.body.names");
 
-        Assert.assertEquals(result, jsonPathValue.toString());
+        Assert.assertEquals(result, this.mapper.writeValueAsString(jsonPathValue));
     }
 
     @Test
diff --git a/core/src/test/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImplTest.java b/core/src/test/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImplTest.java
index 3ca55720b..f0327efe8 100644
--- a/core/src/test/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImplTest.java
+++ b/core/src/test/java/org/jsmart/zerocode/core/engine/sorter/ZeroCodeSorterImplTest.java
@@ -3,7 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.jayway.jsonpath.Configuration;
 import org.jsmart.zerocode.core.di.main.ApplicationMainModule;
+import org.jsmart.zerocode.core.di.provider.JsonPathJacksonProvider;
 import org.jsmart.zerocode.core.di.provider.ObjectMapperProvider;
 import org.jsmart.zerocode.core.domain.ScenarioSpec;
 import org.jsmart.zerocode.core.domain.Step;
@@ -30,6 +32,7 @@ public void setUpStuff() throws Exception {
         injector = Guice.createInjector(new ApplicationMainModule(serverEnvFileName));
         smartUtils = injector.getInstance(SmartUtils.class);
         mapper = new ObjectMapperProvider().get();
+        Configuration.setDefaults(new JsonPathJacksonProvider().get());
         jsonPreProcessor =
                 new ZeroCodeAssertionsProcessorImpl(smartUtils.getMapper(), serverEnvFileName);
 
@@ -64,7 +67,7 @@ public void testSortResponseWithStringField() throws Exception {
                 "}\n";
 
         String result = sorter.sortArrayAndReplaceInResponse(step, response, scenarioExecutionState.getResolvedScenarioState());
-        JSONAssert.assertEquals(sortedResponse, result, false);
+        JSONAssert.assertEquals(sortedResponse, result, true);
     }
 
     @Test
@@ -94,7 +97,7 @@ public void testSortResponseWithIntegerValueAndReverseOrder() throws Exception {
                 "}\n";
 
         String result = sorter.sortArrayAndReplaceInResponse(step, response, scenarioExecutionState.getResolvedScenarioState());
-        JSONAssert.assertEquals(sortedResponse, result, false);
+        JSONAssert.assertEquals(sortedResponse, result, true);
     }
 
     @Test
@@ -124,7 +127,7 @@ public void testSortResponseWithDefaultOrder() throws Exception {
                 "}\n";
 
         String result = sorter.sortArrayAndReplaceInResponse(step, response, scenarioExecutionState.getResolvedScenarioState());
-        JSONAssert.assertEquals(sortedResponse, result, false);
+        JSONAssert.assertEquals(sortedResponse, result, true);
     }
 
 }
diff --git a/core/src/test/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImplTest.java b/core/src/test/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImplTest.java
index d3aa17d62..8b173323a 100644
--- a/core/src/test/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImplTest.java
+++ b/core/src/test/java/org/jsmart/zerocode/core/engine/validators/ZeroCodeValidatorImplTest.java
@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.Is.is;
+import com.jayway.jsonpath.Configuration;
 import org.jsmart.zerocode.TestUtility;
 import org.jsmart.zerocode.core.di.main.ApplicationMainModule;
+import org.jsmart.zerocode.core.di.provider.JsonPathJacksonProvider;
 import org.jsmart.zerocode.core.di.provider.ObjectMapperProvider;
 import org.jsmart.zerocode.core.domain.ScenarioSpec;
 import org.jsmart.zerocode.core.domain.Step;
@@ -15,12 +15,15 @@
 import org.jsmart.zerocode.core.engine.preprocessor.StepExecutionState;
 import org.jsmart.zerocode.core.engine.preprocessor.ZeroCodeAssertionsProcessorImpl;
 import org.jsmart.zerocode.core.utils.SmartUtils;
-import static org.junit.Assert.assertThat;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
 public class ZeroCodeValidatorImplTest {
     Injector injector;
     SmartUtils smartUtils;
@@ -36,6 +39,9 @@ public void setUpStuff() throws Exception {
         injector = Guice.createInjector(new ApplicationMainModule(serverEnvFileName));
         smartUtils = injector.getInstance(SmartUtils.class);
         mapper = new ObjectMapperProvider().get();
+        Configuration.setDefaults(new JsonPathJacksonProvider().get());
+
+
         jsonPreProcessor =
                 new ZeroCodeAssertionsProcessorImpl(smartUtils.getMapper(), serverEnvFileName);
 
diff --git a/pom.xml b/pom.xml
index 28fc070d2..685b0c1d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,11 +203,6 @@
                 <artifactId>json-path</artifactId>
                 <version>${jayway-version}</version>
             </dependency>
-            <dependency>
-                <groupId>net.minidev</groupId>
-                <artifactId>json-smart</artifactId>
-                <version>${json-smart.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.google.classpath-explorer</groupId>