From 5387f6ce0408b92dbe959c5c7a3ac9bae84c9942 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 4 Mar 2022 11:29:37 +0100 Subject: [PATCH] Fixed field name --- .../geoportal/common/model/JSONPathWrapper.java | 11 ++++++++++- .../common/model/profile/HandlerDeclaration.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) 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 823d90e..e626085 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 @@ -18,6 +18,11 @@ import java.util.regex.Pattern; @Slf4j public class JSONPathWrapper { + /** + * Based on + * + * https://github.com/json-path/JsonPath + */ public static Configuration JSON_PATH_ALWAYS_LIST_CONFIG=null; public static Configuration JSON_PATH_PATHS_CONFIGURATION=null; @@ -63,7 +68,11 @@ public class JSONPathWrapper { return getByPath(path,Object.class); } - public List getMatchingPaths(String path){return pathsCTX.read(path); } + public List getMatchingPaths(String path){ + List l=pathsCTX.read(path); + l.removeIf(p->p==null); + return l; + } public List getByPath(String path,Class clazz){ List l= valueCTX.read(path, new TypeRef>() {}); diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/profile/HandlerDeclaration.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/profile/HandlerDeclaration.java index f39854e..7f35752 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/profile/HandlerDeclaration.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/profile/HandlerDeclaration.java @@ -8,7 +8,7 @@ import org.bson.Document; public class HandlerDeclaration { public static final String ID="_id"; - public static final String TYPE="_TYPE"; + public static final String TYPE="_type"; public static final String CONFIGURATION="_configuration"; @JsonProperty(ID)