From 02cd51b751db53586d90d11604ade7133a019628 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 7 Feb 2024 16:27:14 +0200 Subject: [PATCH] description template backend validator changes --- .../descriptiontemplatedefinition/FieldSetPersist.java | 4 ---- .../descriptiontemplatedefinition/SectionPersist.java | 7 ------- .../fielddata/BaseFieldDataPersist.java | 3 --- .../fielddata/ExternalDatasetDataPersist.java | 6 +----- .../fielddata/RadioBoxDataPersist.java | 5 +---- .../fielddata/SelectDataPersist.java | 4 ++-- 6 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java index 4eb502ac0..e382e6dc1 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java @@ -167,10 +167,6 @@ public class FieldSetPersist { this.spec() .must(() -> !this.isEmpty(item.getTitle())) .failOn(FieldSetPersist._title).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldSetPersist._title}, LocaleContextHolder.getLocale())), - this.spec() - .must(() -> !this.isEmpty(item.getDescription())) - .failOn(FieldSetPersist._description).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldSetPersist._description}, LocaleContextHolder.getLocale())), - this.refSpec() .iff(() -> !this.isNull(item.getMultiplicity())) .on(FieldSetPersist._multiplicity) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java index 077ebeb71..0fa58deb2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java @@ -151,18 +151,11 @@ public class SectionPersist { this.spec() .must(() -> !this.isEmpty(item.getTitle())) .failOn(SectionPersist._title).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._title}, LocaleContextHolder.getLocale())), - this.spec() - .must(() -> !this.isEmpty(item.getDescription())) - .failOn(SectionPersist._description).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._description}, LocaleContextHolder.getLocale())), - this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getSections())) .on(SectionPersist._sections) .over(item.getSections()) .using((itm) -> this.validatorFactory.validator(SectionPersistValidator.class)), - this.spec() - .must(() -> !this.isListNullOrEmpty(item.getFieldSets())) - .failOn(SectionPersist._fieldSets).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._fieldSets}, LocaleContextHolder.getLocale())), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getFieldSets())) .on(SectionPersist._fieldSets) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java index ef46e2fb7..b09df07c5 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java @@ -87,9 +87,6 @@ public abstract class BaseFieldDataPersist { protected List getBaseSpecifications(T item) { List specifications = new ArrayList<>(); specifications.addAll(Arrays.asList( - this.spec() - .must(() -> !this.isEmpty(item.getLabel())) - .failOn(BaseFieldDataPersist._label).failWith(messageSource.getMessage("Validation_Required", new Object[]{BaseFieldDataPersist._label}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getFieldType())) .failOn(BaseFieldDataPersist._fieldType).failWith(messageSource.getMessage("Validation_Required", new Object[]{BaseFieldDataPersist._fieldType}, LocaleContextHolder.getLocale())) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java index 6bdde45b1..4bbf1edae 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java @@ -60,11 +60,7 @@ public class ExternalDatasetDataPersist extends BaseFieldDataPersist { specifications.addAll(Arrays.asList( this.spec() .must(() -> !this.isNull(item.getMultipleSelect())) - .failOn(ExternalDatasetDataPersist._multipleSelect).failWith(messageSource.getMessage("Validation_Required", new Object[]{ExternalDatasetDataPersist._multipleSelect}, LocaleContextHolder.getLocale())), - this.spec() - .must(() -> !this.isNull(item.getType())) - .failOn(ExternalDatasetDataPersist._type).failWith(messageSource.getMessage("Validation_Required", new Object[]{ExternalDatasetDataPersist._type}, LocaleContextHolder.getLocale())) - + .failOn(ExternalDatasetDataPersist._multipleSelect).failWith(messageSource.getMessage("Validation_Required", new Object[]{ExternalDatasetDataPersist._multipleSelect}, LocaleContextHolder.getLocale())) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java index c673bf73c..bdc79d9f8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java @@ -55,11 +55,8 @@ public class RadioBoxDataPersist extends BaseFieldDataPersist { this.spec() .must(() -> !this.isNull(item.getFieldType())) .failOn(BaseFieldDataPersist._fieldType).failWith(messageSource.getMessage("Validation_Required", new Object[]{BaseFieldDataPersist._fieldType}, LocaleContextHolder.getLocale())), - this.spec() - .must(() -> !this.isNull(item.getOptions())) - .failOn(RadioBoxDataPersist._options).failWith(messageSource.getMessage("Validation_Required", new Object[]{RadioBoxDataPersist._options}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getOptions())) + .iff(() -> !this.isListNullOrEmpty(item.getOptions())) .on(RadioBoxDataPersist._options) .over(item.getOptions()) .using((itm) -> this.validatorFactory.validator(RadioBoxOptionPersist.RadioBoxOptionPersistValidator.class)) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/SelectDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/SelectDataPersist.java index 4564154af..04b29ae72 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/SelectDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/SelectDataPersist.java @@ -68,10 +68,10 @@ public class SelectDataPersist extends BaseFieldDataPersist { .failOn(SelectDataPersist._multipleSelect).failWith(messageSource.getMessage("Validation_Required", new Object[]{SelectDataPersist._multipleSelect}, LocaleContextHolder.getLocale())), this.spec() - .must(() -> !this.isNull(item.getOptions())) + .must(() -> !this.isListNullOrEmpty(item.getOptions())) .failOn(SelectDataPersist._options).failWith(messageSource.getMessage("Validation_Required", new Object[]{SelectDataPersist._options}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getOptions())) + .iff(() -> !this.isListNullOrEmpty(item.getOptions())) .on(SelectDataPersist._options) .over(item.getOptions()) .using((itm) -> this.validatorFactory.validator(OptionPersist.ComboBoxOptionPersistValidator.class))