diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index e7eb0a93a..fe0ba767e 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -32,7 +32,7 @@ gr.cite validation - 3.0.1 + 3.0.2 gr.cite diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPersist.java index b6234a76a..ed7cdf6a3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionPersist.java @@ -223,7 +223,7 @@ public class DescriptionPersist { .iff(() -> !this.isNull(item.getReferences())) .on(DescriptionPersist._references) .over(item.getReferences()) - .using(() -> this.validatorFactory.validator(DescriptionReferencePersist.DescriptionReferencePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(DescriptionReferencePersist.DescriptionReferencePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java index f4612aaf4..66212ff62 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java @@ -198,7 +198,7 @@ public class DescriptionTemplatePersist { .iff(() -> !this.isNull(item.getUsers())) .on(DescriptionTemplatePersist._users) .over(item.getUsers()) - .using(() -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java index ec68a88e7..be90667b9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java @@ -4,6 +4,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateTypeStatus; import eu.eudat.commons.validation.*; +import eu.eudat.model.persist.dmpproperties.DmpBlueprintValuePersist; +import eu.eudat.model.persist.dmpproperties.DmpPropertiesPersist; +import gr.cite.tools.validation.ValidatorFactory; import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateTypeEntity; @@ -15,6 +18,7 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Component; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.UUID; public class DescriptionTemplateTypePersist { @@ -33,6 +37,17 @@ public class DescriptionTemplateTypePersist { private DescriptionTemplateTypeStatus status; + private Map test; + public final static String _test = "test"; + + public Map getTest() { + return test; + } + + public void setTest(Map test) { + this.test = test; + } + public UUID getId() { return id; } @@ -69,12 +84,14 @@ public class DescriptionTemplateTypePersist { @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) public static class DescriptionTemplateTypePersistValidator extends BaseValidator { public static final String ValidatorName = "DescriptionTemplateTypePersistValidator"; - - private final MessageSource messageSource; - public DescriptionTemplateTypePersistValidator(MessageSource messageSource, ConventionService conventionService, ErrorThesaurusProperties errors) { + private final MessageSource messageSource; + private final ValidatorFactory validatorFactory; + + public DescriptionTemplateTypePersistValidator(MessageSource messageSource, ConventionService conventionService, ErrorThesaurusProperties errors, ValidatorFactory validatorFactory) { super(conventionService, errors); this.messageSource = messageSource; + this.validatorFactory = validatorFactory; } @Override diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java index b90ebbed3..6f37f0719 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java @@ -201,7 +201,7 @@ public class DmpPersist { .iff(() -> !this.isNull(item.getDescriptionTemplates())) .on(DmpPersist._descriptionTemplates) .over(item.getDescriptionTemplates()) - .using(() -> this.validatorFactory.validator(DmpDescriptionTemplatePersist.DmpDescriptionTemplatePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(DmpDescriptionTemplatePersist.DmpDescriptionTemplatePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInvitePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInvitePersist.java index 9dd07a3e3..44b06123f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInvitePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInvitePersist.java @@ -76,7 +76,7 @@ public class DmpUserInvitePersist { .iff(() -> !this.isNull(item.getUsers())) .on(DmpUserInvitePersist._users) .over(item.getUsers()) - .using(() -> this.validatorFactory.validator(DmpUserInviteTypePersist.DmpUserInviteTypePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(DmpUserInviteTypePersist.DmpUserInviteTypePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDescriptionTemplatePersist.java index 2e056d6ef..3318cf9ae 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDescriptionTemplatePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDescriptionTemplatePersist.java @@ -189,7 +189,7 @@ public class NewVersionDescriptionTemplatePersist { .iff(() -> !this.isNull(item.getUsers())) .on(NewVersionDescriptionTemplatePersist._users) .over(item.getUsers()) - .using(() -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java index 1d2ea19c5..debd73c96 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java @@ -64,7 +64,7 @@ public class PropertyDefinitionPersist { .iff(() -> !this.isNull(item.getFields())) .on(PropertyDefinitionPersist._fields) .over(item.getFields()) - .using(() -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) ); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java index 610651d72..580f16f71 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java @@ -149,7 +149,7 @@ public class FieldPersist { .iff(() -> !this.isNull(item.getVisibilityRules())) .on(FieldPersist._visibilityRules) .over(item.getVisibilityRules()) - .using(() -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class)), this.refSpec() .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() != null) .on(FieldPersist._data) 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 248e03f94..3d6890865 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 @@ -179,7 +179,7 @@ public class FieldSetPersist { .iff(() -> !this.isNull(item.getFields())) .on(FieldSetPersist._fields) .over(item.getFields()) - .using(() -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) ); } } 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 041860e09..535ac7570 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 @@ -174,7 +174,7 @@ public class SectionPersist { .iff(() -> !this.isNull(item.getSections())) .on(SectionPersist._sections) .over(item.getSections()) - .using(() -> this.validatorFactory.validator(SectionPersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(SectionPersistValidator.class)), this.spec() .must(() -> !this.isNull(item.getFieldSets())) .failOn(SectionPersist._fieldSets).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._fieldSets}, LocaleContextHolder.getLocale())), @@ -182,7 +182,7 @@ public class SectionPersist { .iff(() -> !this.isNull(item.getFieldSets())) .on(SectionPersist._fieldSets) .over(item.getFieldSets()) - .using(() -> this.validatorFactory.validator(FieldSetPersist.FieldSetPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(FieldSetPersist.FieldSetPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java index 1e494ca56..f103cfd29 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java @@ -68,7 +68,7 @@ public class AutoCompleteDataPersist extends BaseFieldDataPersist { .iff(() -> !this.isNull(item.getAutoCompleteSingleDataList())) .on(AutoCompleteDataPersist._autoCompleteSingleDataList) .over(item.getAutoCompleteSingleDataList()) - .using(() -> this.validatorFactory.validator(AutoCompleteSingleDataPersist.AutoCompleteSingleDataPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(AutoCompleteSingleDataPersist.AutoCompleteSingleDataPersistValidator.class)) )); 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 951ea14dc..c014a5258 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 @@ -56,7 +56,7 @@ public class RadioBoxDataPersist extends BaseFieldDataPersist { .iff(() -> !this.isNull(item.getOptions())) .on(RadioBoxDataPersist._options) .over(item.getOptions()) - .using(() -> this.validatorFactory.validator(RadioBoxOptionPersist.RadioBoxOptionPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(RadioBoxOptionPersist.RadioBoxOptionPersistValidator.class)) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java index 8d9ad4b61..0a5311a65 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java @@ -73,7 +73,7 @@ public class UploadDataPersist extends BaseFieldDataPersist { .iff(() -> !this.isNull(item.getTypes())) .on(UploadDataPersist._types) .over(item.getTypes()) - .using(() -> this.validatorFactory.validator(UploadOptionPersist.UploadOptionPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(UploadOptionPersist.UploadOptionPersistValidator.class)) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java index a021ddff0..cc3a3d8ca 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java @@ -72,7 +72,7 @@ public class WordListDataPersist extends BaseFieldDataPersist { .iff(() -> !this.isNull(item.getOptions())) .on(WordListDataPersist._options) .over(item.getOptions()) - .using(() -> this.validatorFactory.validator(ComboBoxOptionPersist.ComboBoxOptionPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(ComboBoxOptionPersist.ComboBoxOptionPersistValidator.class)) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java index af732c798..7b0f6a798 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java @@ -59,7 +59,7 @@ public class DefinitionPersist { .iff(() -> !this.isNull(item.getSections())) .on(DefinitionPersist._sections) .over(item.getSections()) - .using(() -> this.validatorFactory.validator(SectionPersist.SectionPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(SectionPersist.SectionPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SectionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SectionPersist.java index b687d5f5d..e00154889 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SectionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SectionPersist.java @@ -144,12 +144,12 @@ public class SectionPersist { .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(SectionPersist._fields) .over(item.getFields().stream().filter(x -> x.getCategory() == DmpBlueprintFieldCategory.System).toList()) - .using(() -> this.validatorFactory.validator(SystemFieldPersist.SystemFieldPersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(SystemFieldPersist.SystemFieldPersistValidator.class)), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(SectionPersist._fields) .over(item.getFields().stream().filter(x -> x.getCategory() == DmpBlueprintFieldCategory.Extra).toList()) - .using(() -> this.validatorFactory.validator(ExtraFieldPersist.ExtraFieldPersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(ExtraFieldPersist.ExtraFieldPersistValidator.class)), this.spec() .must(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .failOn(SectionPersist._descriptionTemplates).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())), @@ -157,7 +157,7 @@ public class SectionPersist { .iff(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .on(SectionPersist._descriptionTemplates) .over(item.getDescriptionTemplates()) - .using(() -> this.validatorFactory.validator(DescriptionTemplatePersist.DescriptionTemplatePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(DescriptionTemplatePersist.DescriptionTemplatePersistValidator.class)) ); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java index 389f1db63..79c4ea69c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java @@ -60,7 +60,7 @@ public class DefinitionPersist { .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(DefinitionPersist._fields) .over(item.getFields()) - .using(() -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java index 9daea64be..ccb03e6aa 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java @@ -69,7 +69,7 @@ public class ReferenceTypeDefinitionPersist { .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(ReferenceTypeDefinitionPersist._fields) .over(item.getFields()) - .using(() -> this.validatorFactory.validator(ReferenceTypeFieldPersist.ReferenceTypeFieldPersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(ReferenceTypeFieldPersist.ReferenceTypeFieldPersistValidator.class)), this.spec() .must(() -> !this.isListNullOrEmpty(item.getSources())) .failOn(ReferenceTypeDefinitionPersist._sources).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferenceTypeDefinitionPersist._sources}, LocaleContextHolder.getLocale())), @@ -77,12 +77,12 @@ public class ReferenceTypeDefinitionPersist { .iff(() -> !this.isListNullOrEmpty(item.getSources())) .on(ReferenceTypeDefinitionPersist._sources) .over(item.getSources().stream().filter(x -> x.getType() == ReferenceTypeSourceType.API).toList()) - .using(() -> this.validatorFactory.validator(ReferenceTypeSourceExternalApiConfigurationPersist.ReferenceTypeSourceExternalApiConfigurationPersistValidator.class)), + .using((itm) -> this.validatorFactory.validator(ReferenceTypeSourceExternalApiConfigurationPersist.ReferenceTypeSourceExternalApiConfigurationPersistValidator.class)), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getSources())) .on(ReferenceTypeDefinitionPersist._sources) .over(item.getSources().stream().filter(x -> x.getType() == ReferenceTypeSourceType.STATIC).toList()) - .using(() -> this.validatorFactory.validator(ReferenceTypeSourceStaticOptionConfigurationPersist.ReferenceTypeSourceStaticOptionConfigurationPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(ReferenceTypeSourceStaticOptionConfigurationPersist.ReferenceTypeSourceStaticOptionConfigurationPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseConfigurationPersist.java index bba124b62..a6b771d24 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseConfigurationPersist.java @@ -118,7 +118,7 @@ public abstract class ReferenceTypeSourceBaseConfigurationPersist { .iff(() -> !this.isListNullOrEmpty(item.getDependencies())) .on(ReferenceTypeSourceBaseConfigurationPersist._dependencies) .over(item.getDependencies()) - .using(() -> this.validatorFactory.validator(ReferenceTypeSourceBaseDependencyPersist.ReferenceTypeSourceBaseDependencyPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(ReferenceTypeSourceBaseDependencyPersist.ReferenceTypeSourceBaseDependencyPersistValidator.class)) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java index e90454f36..e70812649 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java @@ -105,7 +105,7 @@ public class ReferenceTypeSourceBaseDependencyPersist { .iff(() -> !this.isListNullOrEmpty(item.getProperties())) .on(ReferenceTypeSourceBaseDependencyPersist._properties) .over(item.getProperties()) - .using(() -> this.validatorFactory.validator(DependencyPropertyPersist.DependencyPropertyPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(DependencyPropertyPersist.DependencyPropertyPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceExternalApiConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceExternalApiConfigurationPersist.java index a195e8a28..c88df4c67 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceExternalApiConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceExternalApiConfigurationPersist.java @@ -187,7 +187,7 @@ public class ReferenceTypeSourceExternalApiConfigurationPersist extends Referenc .iff(() -> !this.isListNullOrEmpty(item.getQueries())) .on(ReferenceTypeSourceExternalApiConfigurationPersist._queries) .over(item.getQueries()) - .using(() -> this.validatorFactory.validator(QueryConfigPersist.QueryConfigPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(QueryConfigPersist.QueryConfigPersistValidator.class)) )); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java index fdd86d0d1..33d20602f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java @@ -49,7 +49,7 @@ public class ReferenceTypeSourceStaticOptionConfigurationPersist extends Referen .iff(() -> !this.isListNullOrEmpty(item.getOptions())) .on(ReferenceTypeSourceStaticOptionConfigurationPersist._options) .over(item.getOptions()) - .using(() -> this.validatorFactory.validator(ReferenceTypeStaticOptionPersist.ReferenceTypeStaticOptionPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(ReferenceTypeStaticOptionPersist.ReferenceTypeStaticOptionPersistValidator.class)) ); return specifications; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java index 36d90990f..843ccd61a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java @@ -75,7 +75,7 @@ public class ResultsConfigurationPersist { .iff(() -> !this.isListNullOrEmpty(item.getFieldsMapping())) .on(ResultsConfigurationPersist._fieldsMapping) .over(item.getFieldsMapping()) - .using(() -> this.validatorFactory.validator(ResultFieldsMappingConfigurationPersist.ResultFieldsMappingConfigurationPersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(ResultFieldsMappingConfigurationPersist.ResultFieldsMappingConfigurationPersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java index dcef33f67..90901f4e7 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java @@ -51,7 +51,7 @@ public class TenantDepositConfigPersist { .iff(() -> !this.isListNullOrEmpty(item.getSources())) .on(TenantDepositConfigPersist._sources) .over(item.getSources()) - .using(() -> this.validatorFactory.validator(TenantSourcePersist.TenantSourcePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(TenantSourcePersist.TenantSourcePersistValidator.class)) ); } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java index e79c11aa8..1e6641ab2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java @@ -51,7 +51,7 @@ public class TenantFileTransformersConfigPersist { .iff(() -> !this.isListNullOrEmpty(item.getSources())) .on(TenantFileTransformersConfigPersist._sources) .over(item.getSources()) - .using(() -> this.validatorFactory.validator(TenantSourcePersist.TenantSourcePersistValidator.class)) + .using((itm) -> this.validatorFactory.validator(TenantSourcePersist.TenantSourcePersistValidator.class)) ); } } diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index a84638b7f..a16c5f273 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -330,7 +330,7 @@ gr.cite validation - 3.0.1 + 3.0.2 gr.cite