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 ed7cdf6a3..1e4cef9ff 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 @@ -203,7 +203,7 @@ public class DescriptionPersist { .failOn(DescriptionPersist._status).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPersist._status}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> item.getStatus() == DescriptionStatus.Finalized) - .must(() -> !this.isNull(item.getTags())) + .must(() -> !this.isListNullOrEmpty(item.getTags())) .failOn(DescriptionPersist._tags).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPersist._tags}, LocaleContextHolder.getLocale())), this.spec() @@ -217,10 +217,10 @@ public class DescriptionPersist { .using(() -> this.validatorFactory.validator(PropertyDefinitionPersist.PropertyDefinitionPersistValidator.class).setStatus(item.getStatus())), this.spec() .iff(() -> item.getStatus() == DescriptionStatus.Finalized) - .must(() -> !this.isNull(item.getReferences())) + .must(() -> !this.isListNullOrEmpty(item.getReferences())) .failOn(DescriptionPersist._references).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionPersist._references}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getReferences())) + .iff(() -> !this.isListNullOrEmpty(item.getReferences())) .on(DescriptionPersist._references) .over(item.getReferences()) .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 66212ff62..cb21d765f 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 @@ -192,10 +192,10 @@ public class DescriptionTemplatePersist { .using(() -> this.validatorFactory.validator(DefinitionPersist.DefinitionPersistValidator.class)), this.spec() .iff(() -> item.getStatus() == DescriptionTemplateStatus.Finalized) - .must(() -> !this.isNull(item.getUsers())) + .must(() -> !this.isListNullOrEmpty(item.getUsers())) .failOn(DescriptionTemplatePersist._users).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionTemplatePersist._users}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getUsers())) + .iff(() -> !this.isListNullOrEmpty(item.getUsers())) .on(DescriptionTemplatePersist._users) .over(item.getUsers()) .using((itm) -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) 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 6f37f0719..da15978af 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 @@ -195,10 +195,10 @@ public class DmpPersist { .using(() -> this.validatorFactory.validator(DmpPropertiesPersist.DmpPropertiesPersistValidator.class).setStatus(item.getStatus())), this.spec() .iff(() -> item.getStatus() == DmpStatus.Finalized) - .must(() -> !this.isNull(item.getDescriptionTemplates())) + .must(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .failOn(DmpPersist._descriptionTemplates).failWith(messageSource.getMessage("Validation_Required", new Object[]{DmpPersist._descriptionTemplates}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getDescriptionTemplates())) + .iff(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .on(DmpPersist._descriptionTemplates) .over(item.getDescriptionTemplates()) .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 44b06123f..6d4b34fc6 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 @@ -70,10 +70,10 @@ public class DmpUserInvitePersist { .failOn(DmpUserInvitePersist._role).failWith(messageSource.getMessage("Validation_Required", new Object[]{DmpUserInvitePersist._role}, LocaleContextHolder.getLocale())), this.spec() - .must(() -> !this.isNull(item.getUsers())) + .must(() -> !this.isListNullOrEmpty(item.getUsers())) .failOn(DmpUserInvitePersist._users).failWith(messageSource.getMessage("Validation_Required", new Object[]{DmpUserInvitePersist._users}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getUsers())) + .iff(() -> !this.isListNullOrEmpty(item.getUsers())) .on(DmpUserInvitePersist._users) .over(item.getUsers()) .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 3318cf9ae..9b2133d06 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 @@ -183,10 +183,10 @@ public class NewVersionDescriptionTemplatePersist { .over(item.getDefinition()) .using(() -> this.validatorFactory.validator(DefinitionPersist.DefinitionPersistValidator.class)), this.spec() - .must(() -> !this.isNull(item.getUsers())) + .must(() -> !this.isListNullOrEmpty(item.getUsers())) .failOn(NewVersionDescriptionTemplatePersist._users).failWith(messageSource.getMessage("Validation_Required", new Object[]{NewVersionDescriptionTemplatePersist._users}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getUsers())) + .iff(() -> !this.isListNullOrEmpty(item.getUsers())) .on(NewVersionDescriptionTemplatePersist._users) .over(item.getUsers()) .using((itm) -> this.validatorFactory.validator(UserDescriptionTemplatePersist.UserDescriptionTemplatePersistValidator.class)) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserRolePatchPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserRolePatchPersist.java index 27e51a081..8fc1017e8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserRolePatchPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserRolePatchPersist.java @@ -80,7 +80,7 @@ public class UserRolePatchPersist { .must(() -> !this.isValidHash(item.getHash())) .failOn(UserRolePatchPersist._hash).failWith(messageSource.getMessage("Validation_OverPosting", new Object[]{}, LocaleContextHolder.getLocale())), this.spec() - .must(() -> !this.isNull(item.getRoles())) + .must(() -> !this.isListNullOrEmpty(item.getRoles())) .failOn(UserRolePatchPersist._roles).failWith(messageSource.getMessage("Validation_Required", new Object[]{UserRolePatchPersist._roles}, LocaleContextHolder.getLocale())) ); } 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 debd73c96..3baa050cf 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 @@ -58,10 +58,10 @@ public class PropertyDefinitionPersist { return Arrays.asList( this.spec() .iff(() -> this.status == DescriptionStatus.Finalized) - .must(() -> !this.isNull(item.getFields())) + .must(() -> !this.isListNullOrEmpty(item.getFields())) .failOn(PropertyDefinitionPersist._fields).failWith(messageSource.getMessage("Validation_Required", new Object[]{PropertyDefinitionPersist._fields}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getFields())) + .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(PropertyDefinitionPersist._fields) .over(item.getFields()) .using((itm) -> this.validatorFactory.validator(FieldPersist.FieldPersistValidator.class)) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java index 84f25187d..b8561beae 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java @@ -65,18 +65,18 @@ public class DefinitionPersist { protected List specifications(DefinitionPersist item) { return Arrays.asList( this.spec() - .must(() -> !this.isNull(item.getSections())) + .must(() -> !this.isListNullOrEmpty(item.getSections())) .failOn(DefinitionPersist._sections).failWith(messageSource.getMessage("Validation_Required", new Object[]{DefinitionPersist._sections}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getSections())) + .iff(() -> !this.isListNullOrEmpty(item.getSections())) .on(DefinitionPersist._sections) .over(item.getSections()) .using((itm) -> this.validatorFactory.validator(SectionPersist.SectionPersistValidator.class)), this.spec() - .must(() -> !this.isNull(item.getPages())) + .must(() -> !this.isListNullOrEmpty(item.getPages())) .failOn(DefinitionPersist._pages).failWith(messageSource.getMessage("Validation_Required", new Object[]{DefinitionPersist._pages}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getPages())) + .iff(() -> !this.isListNullOrEmpty(item.getPages())) .on(DefinitionPersist._pages) .over(item.getPages()) .using((itm) -> this.validatorFactory.validator(PagePersist.PagePersistValidator.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 580f16f71..ec02d1b10 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 @@ -146,7 +146,7 @@ public class FieldPersist { .failOn(FieldPersist._includeInExport).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._includeInExport}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getVisibilityRules())) + .iff(() -> !this.isListNullOrEmpty(item.getVisibilityRules())) .on(FieldPersist._visibilityRules) .over(item.getVisibilityRules()) .using((itm) -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class)), 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 3d6890865..800575afe 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 @@ -176,7 +176,7 @@ public class FieldSetPersist { .over(item.getMultiplicity()) .using(() -> this.validatorFactory.validator(MultiplicityPersist.MultiplicityValidator.class)), this.navSpec() - .iff(() -> !this.isNull(item.getFields())) + .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(FieldSetPersist._fields) .over(item.getFields()) .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 535ac7570..ff4982a5d 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 @@ -171,15 +171,15 @@ public class SectionPersist { .failOn(SectionPersist._description).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._description}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getSections())) + .iff(() -> !this.isListNullOrEmpty(item.getSections())) .on(SectionPersist._sections) .over(item.getSections()) .using((itm) -> this.validatorFactory.validator(SectionPersistValidator.class)), this.spec() - .must(() -> !this.isNull(item.getFieldSets())) + .must(() -> !this.isListNullOrEmpty(item.getFieldSets())) .failOn(SectionPersist._fieldSets).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._fieldSets}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getFieldSets())) + .iff(() -> !this.isListNullOrEmpty(item.getFieldSets())) .on(SectionPersist._fieldSets) .over(item.getFieldSets()) .using((itm) -> this.validatorFactory.validator(FieldSetPersist.FieldSetPersistValidator.class)) 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 7b0f6a798..ef58a6976 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 @@ -53,10 +53,10 @@ public class DefinitionPersist { protected List specifications(DefinitionPersist item) { return Arrays.asList( this.spec() - .must(() -> !this.isNull(item.getSections())) + .must(() -> !this.isListNullOrEmpty(item.getSections())) .failOn(DefinitionPersist._sections).failWith(messageSource.getMessage("Validation_Required", new Object[]{eu.eudat.model.persist.descriptiontemplatedefinition.DefinitionPersist._sections}, LocaleContextHolder.getLocale())), this.navSpec() - .iff(() -> !this.isNull(item.getSections())) + .iff(() -> !this.isListNullOrEmpty(item.getSections())) .on(DefinitionPersist._sections) .over(item.getSections()) .using((itm) -> this.validatorFactory.validator(SectionPersist.SectionPersistValidator.class)) diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java index 5ac92a9ac..4748f7019 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java @@ -72,7 +72,7 @@ public class DmpPropertiesPersist { .mapKey((k) -> ((UUID)k).toString()) .using((itm) -> this.validatorFactory.validator(DmpBlueprintValuePersist.DmpBlueprintValuePersistValidator.class)), this.navSpec() - .iff(() -> this.status == DmpStatus.Finalized && !this.isNull(item.getContacts())) + .iff(() -> this.status == DmpStatus.Finalized && !this.isListNullOrEmpty(item.getContacts())) .on(DmpPropertiesPersist._contacts) .over(item.getContacts()) .using((itm) -> this.validatorFactory.validator(DmpContactPersist.DmpContactPersistValidator.class)) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java index 9a6d476b5..f94d3beba 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java @@ -137,14 +137,14 @@ public class DmpController { public Dmp Persist(@RequestBody DmpPersist model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, InvalidApplicationException, IOException { logger.debug(new MapLogEntry("persisting" + Dmp.class.getSimpleName()).And("model", model).And("fieldSet", fieldSet)); - Dmp persisted = this.dmpService.persist(model, fieldSet); + //Dmp persisted = this.dmpService.persist(model, fieldSet); this.auditService.track(AuditableAction.Dmp_Persist, Map.ofEntries( new AbstractMap.SimpleEntry("model", model), new AbstractMap.SimpleEntry("fields", fieldSet) )); - return persisted; + return null; } @DeleteMapping("{id}")