From 6a38ebc0c894ecd559d05485a7478f9c3738faf8 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 23 May 2023 15:42:51 +0200 Subject: [PATCH] Renamed "grouped custom layers" to "grouped overlay layers" --- CHANGELOG.md | 2 +- .../geoportalcommon/ConvertToDataValueObjectModel.java | 2 +- .../shared/geoportal/ucd/GEOPORTAL_CONFIGURATION_TYPE.java | 2 +- .../shared/geoportal/ucd/GEOPORTAL_DATA_HANDLER.java | 2 +- src/test/java/org/gcube/application/UCD_Tests.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d14ecd4..0816d23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v2.2.0-SNAPSHOT] - Integrated the cross-filtering configuration [#25074] -- Integrated the grouped custom layers configuration [#25110] +- Integrated the grouped overlay layers configuration [#25110] ## [v2.1.0] - 2023-05-11 diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java index d046de3..012ea51 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java +++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java @@ -375,7 +375,7 @@ public class ConvertToDataValueObjectModel { return hdDV; } - case grouped_custom_layers: { + case grouped_overlay_layers: { List listGroupedCL = new ArrayList( jsonConfigurations.size()); diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_CONFIGURATION_TYPE.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_CONFIGURATION_TYPE.java index f6e8330..f8f1134 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_CONFIGURATION_TYPE.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_CONFIGURATION_TYPE.java @@ -1,7 +1,7 @@ package org.gcube.application.geoportalcommon.shared.geoportal.ucd; public enum GEOPORTAL_CONFIGURATION_TYPE { - item_fields("itemFields"), gcube_profiles("gcubeProfiles"), actions_definition("actionsDefinition"), grouped_custom_layers("grouped_custom_layers"); + item_fields("itemFields"), gcube_profiles("gcubeProfiles"), actions_definition("actionsDefinition"), grouped_overlay_layers("grouped_overlay_layers"); String id; diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_DATA_HANDLER.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_DATA_HANDLER.java index 7360d3c..2ca5648 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_DATA_HANDLER.java +++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ucd/GEOPORTAL_DATA_HANDLER.java @@ -8,7 +8,7 @@ public enum GEOPORTAL_DATA_HANDLER { geoportal_workflow_action_list("org.gcube.portlets.user.geoportal-workflow-action-list","WORKFLOW_ACTION_LIST_GUI"), geoportal_timeline_json_template("org.gcube.portlets.user.geoportal-timeline-json-template","TIMELINE_JSON_TEMPLATE"), geoportal_cross_filtering("org.gcube.portlets.user.cross-filtering","CROSS_FILTERING"), - geoportal_grouped_custom_layers("org.gcube.portlets.user.grouped_custom_layers","GROUPED_CUSTOM_LAYERS"), + geoportal_grouped_overlay_layers("org.gcube.portlets.user.grouped_overlay_layers","GROUPED_OVERLAY_LAYERS"), gna_concessioni_lc("GNA-CONCESSIONI-LC", "LifecycleManagement"); String id; diff --git a/src/test/java/org/gcube/application/UCD_Tests.java b/src/test/java/org/gcube/application/UCD_Tests.java index bc60d9a..fd7a171 100644 --- a/src/test/java/org/gcube/application/UCD_Tests.java +++ b/src/test/java/org/gcube/application/UCD_Tests.java @@ -243,7 +243,7 @@ public class UCD_Tests { UseCaseDescriptorCaller client = GeoportalClientCaller.useCaseDescriptors(); if (handlersIds == null) { - handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_grouped_custom_layers.getId()); + handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers.getId()); System.out.println("handlersIds is null, so using default: " + handlersIds); } listUseCaseDescriptor = client.getListForHandlerIds(handlersIds); @@ -276,7 +276,7 @@ public class UCD_Tests { ScopeProvider.instance.set(CONTEXT); SecurityTokenProvider.instance.set(TOKEN); - String handlerType = GEOPORTAL_DATA_HANDLER.geoportal_grouped_custom_layers.getType(); + String handlerType = GEOPORTAL_DATA_HANDLER.geoportal_grouped_overlay_layers.getType(); UseCaseDescriptor ucd = null; List handlers = null; @@ -293,7 +293,7 @@ public class UCD_Tests { for (HandlerDeclaration handlerDeclaration : handlers) { System.out.println(handlerDeclaration); System.out.println("Config json: "+handlerDeclaration.getConfiguration().toJson()); - HandlerDeclarationDV handlerDV = ConvertToDataValueObjectModel.toHandlerDeclarationDV(handlerDeclaration, ucd, GEOPORTAL_CONFIGURATION_TYPE.grouped_custom_layers); + HandlerDeclarationDV handlerDV = ConvertToDataValueObjectModel.toHandlerDeclarationDV(handlerDeclaration, ucd, GEOPORTAL_CONFIGURATION_TYPE.grouped_overlay_layers); System.out.println("handlerDV is: "+handlerDV); }