From 481817e58885d8cec9e2ef74b362208343ee3669 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 22 Feb 2024 15:06:31 +0100 Subject: [PATCH] added new reserved prefixes `relatedIdentifier:Zenodo` --- .../server/CKANPublisherServicesImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index 214d98e..f0a77fb 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -74,13 +74,16 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C // private static final org.slf4j.Logger logger = // LoggerFactory.getLogger(CKANPublisherServicesImpl.class); private static final Logger logger = LoggerFactory.getLogger(CKANPublisherServicesImpl.class); - public static final String ITEM_URL_FIELD = "Item URL"; - public static final String SYSTEM_KEY_PREFIX = "system:"; - public static final String SYS_TYPE = SYSTEM_KEY_PREFIX + "type"; + public static final String TAGS_VOCABULARY_KEY = "TAGS_VOCABULARY"; + + public static final String ITEM_URL_FIELD = "Item URL"; + public static final String RELATED_IDENTIFIER_ZENODO = "relatedIdentifier:Zenodo"; + public static final String SYSTEM_KEY_PREFIX = "system:"; + //These fiels are not upgradable via Edit Facility. They are not returned to the client + public static final List NOT_UPGRADABLE_CUSTOM_FIELDS_PREFIXES = Arrays.asList(ITEM_URL_FIELD, SYSTEM_KEY_PREFIX, RELATED_IDENTIFIER_ZENODO); - public static final List SYSTEM_CUSTOM_FIELDS_PREFIXES = Arrays.asList(ITEM_URL_FIELD, SYSTEM_KEY_PREFIX); - + public static final String SYS_TYPE = SYSTEM_KEY_PREFIX + "type"; // map private ConcurrentHashMap mapOrganizationScope = new ConcurrentHashMap(); @@ -1331,13 +1334,13 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C * @return the map */ public static Map> purgeSystemFields(Map> extras) { - logger.info("Purging extras from reserved fields {} ", SYSTEM_CUSTOM_FIELDS_PREFIXES); + logger.info("Purging extras from reserved fields {} ", NOT_UPGRADABLE_CUSTOM_FIELDS_PREFIXES); if (extras == null) return null; Map> extrasPop = new HashMap>(extras); for (String key : extras.keySet()) { - List list = SYSTEM_CUSTOM_FIELDS_PREFIXES.stream().filter(scf -> key.startsWith(scf)) + List list = NOT_UPGRADABLE_CUSTOM_FIELDS_PREFIXES.stream().filter(scf -> key.startsWith(scf)) .collect(Collectors.toList()); if (list.size() > 0) @@ -1398,7 +1401,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C Map> reserverSystemExtras = new HashMap>(); for (String key : extras.keySet()) { - List list = SYSTEM_CUSTOM_FIELDS_PREFIXES.stream().filter(scf -> key.startsWith(scf)) + List list = NOT_UPGRADABLE_CUSTOM_FIELDS_PREFIXES.stream().filter(scf -> key.startsWith(scf)) .collect(Collectors.toList()); if (list.size() > 0)