diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml
index 4c429e6..513c053 100644
--- a/geoportal-common/pom.xml
+++ b/geoportal-common/pom.xml
@@ -44,7 +44,7 @@
com.jayway.jsonpath
json-path
- 2.4.0
+ 2.7.0
diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java
index a03532b..b40869e 100644
--- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java
+++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/JSONPathWrapper.java
@@ -2,18 +2,23 @@ package org.gcube.application.geoportal.common.model;
import com.jayway.jsonpath.*;
+import com.mongodb.util.JSON;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
import org.gcube.application.geoportal.common.JSONSerializationProvider;
import org.reflections.Reflections;
import org.reflections.util.ConfigurationBuilder;
import org.reflections.util.FilterBuilder;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
@Slf4j
public class JSONPathWrapper {
+
public static Configuration JSON_PATH_ALWAYS_LIST_CONFIG=null;
public static Configuration JSON_PATH_PATHS_CONFIGURATION=null;
@@ -44,48 +49,176 @@ public class JSONPathWrapper {
@Getter
- DocumentContext ctx=null;
+ DocumentContext valueCTX =null;
+ DocumentContext pathsCTX =null;
+
public JSONPathWrapper(String json) {
- ctx=JsonPath.using(JSON_PATH_ALWAYS_LIST_CONFIG).parse(json);
+
+ valueCTX =JsonPath.using(JSON_PATH_ALWAYS_LIST_CONFIG).parse(json);
+ pathsCTX =JsonPath.using(JSON_PATH_PATHS_CONFIGURATION).parse(json);
}
public List