From 7e63abca505d5cfebc0bfa62555868290caab7f2 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Wed, 31 Jan 2024 14:44:20 +0200 Subject: [PATCH] refactor description template xml --- .../core/src/main/java/eu/eudat/commons/enums/FieldType.java | 2 +- .../model/builder/deposit/DescriptionFieldDepositBuilder.java | 2 +- .../fielddatahelper/FieldDataHelperServiceProvider.java | 2 +- .../eu/eudat/service/prefilling/PrefillingServiceImpl.java | 4 ++-- .../eu/eudat/logic/mapper/prefilling/PrefillingMapper.java | 2 +- .../xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java index 73715070a..7f5ba87b2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java @@ -6,7 +6,7 @@ import eu.eudat.data.converters.enums.DatabaseEnum; import java.util.Map; public enum FieldType implements DatabaseEnum { - AUTO_COMPLETE(Names.ExternalSelect), + EXTERNAL_SELECT(Names.ExternalSelect), SELECT(Names.Select), BOOLEAN_DECISION(Names.BooleanDecision), RADIO_BOX(Names.RadioBox), diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/deposit/DescriptionFieldDepositBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/deposit/DescriptionFieldDepositBuilder.java index 2576161ff..5548e9d61 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/deposit/DescriptionFieldDepositBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/deposit/DescriptionFieldDepositBuilder.java @@ -77,7 +77,7 @@ public class DescriptionFieldDepositBuilder extends BaseDepositBuilder m.setFieldType(FieldType.AUTO_COMPLETE); + case EXTERNAL_SELECT -> m.setFieldType(FieldType.AUTO_COMPLETE); case SELECT -> m.setFieldType(FieldType.WORD_LIST); case BOOLEAN_DECISION -> m.setFieldType(FieldType.BOOLEAN_DECISION); case RADIO_BOX -> m.setFieldType(FieldType.RADIO_BOX); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java index 0025cab63..570b9c7f3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java @@ -60,7 +60,7 @@ public class FieldDataHelperServiceProvider { item = this.applicationContext.getBean(SelectFieldDataHelperService.class); break; } - case AUTO_COMPLETE: { + case EXTERNAL_SELECT: { item = this.applicationContext.getBean(ExternalSelectFieldDataHelperService.class); break; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java index 1a7a68201..6f98fc74e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java @@ -282,7 +282,7 @@ public class PrefillingServiceImpl implements PrefillingService { Field field = new Field(); field.setKey(id); switch (fieldEntity.getData().getFieldType()) { - case AUTO_COMPLETE: + case EXTERNAL_SELECT: case SELECT: { if (!parsedValues.stream().allMatch(Objects::isNull)) { field.setValue(this.jsonHandlingService.toJsonSafe(parseComboBoxValues(fieldEntity, parsedValues))); @@ -364,7 +364,7 @@ public class PrefillingServiceImpl implements PrefillingService { private Object parseComboBoxValues(FieldEntity fieldEntity, List parsedValues) { List normalizedValues = new ArrayList<>(); boolean isMultiSelect; - if(fieldEntity.getData().getFieldType().equals(FieldType.AUTO_COMPLETE)) { + if(fieldEntity.getData().getFieldType().equals(FieldType.EXTERNAL_SELECT)) { ExternalSelectDataEntity autoCompleteData = (ExternalSelectDataEntity)fieldEntity.getData(); isMultiSelect = autoCompleteData.getMultipleSelect(); for (String format : parsedValues) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java index 9a94f43d3..7fc696885 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java @@ -165,7 +165,7 @@ public class PrefillingMapper { String renderStyle = node.isArray() ? node.get(0).get("viewStyle").get("renderStyle").asText() : node.get("viewStyle").get("renderStyle").asText(); switch (FieldType.of(renderStyle)) { - case AUTO_COMPLETE: + case EXTERNAL_SELECT: case SELECT: if (parsedValues.isEmpty()) parsedValues.add(parsedValue); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java index 0ff709d2b..503b5c57b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java @@ -213,7 +213,7 @@ public class ExportXmlBuilderDatasetProfile { Element dataOut = element.createElement("data"); switch (field.getViewStyle().getFieldType()) { case SELECT: - case AUTO_COMPLETE: + case EXTERNAL_SELECT: // ComboBoxDataEntity comboBoxDataEntityObject = (ComboBoxDataEntity) field.getData(); // if (comboBoxDataEntityObject.getFieldType().equals("wordlist")) { // SelectDataEntity selectDataEntityObject = (SelectDataEntity) field.getData();