diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/NewVersionPlanBlueprintPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/NewVersionPlanBlueprintPersist.java index b2f21a00c..313d304e5 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/NewVersionPlanBlueprintPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/NewVersionPlanBlueprintPersist.java @@ -7,7 +7,7 @@ import org.opencdmp.commons.validation.BaseValidator; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.PlanBlueprintEntity; import org.opencdmp.errorcode.ErrorThesaurusProperties; -import org.opencdmp.model.persist.dmpblueprintdefinition.DefinitionPersist; +import org.opencdmp.model.persist.planblueprintdefinition.DefinitionPersist; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Scope; diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/PlanBlueprintPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/PlanBlueprintPersist.java index cafb76201..3ce28973f 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/PlanBlueprintPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/PlanBlueprintPersist.java @@ -1,14 +1,14 @@ package org.opencdmp.model.persist; -import org.opencdmp.commons.enums.PlanBlueprintStatus; -import org.opencdmp.commons.validation.BaseValidator; import gr.cite.tools.validation.ValidatorFactory; import gr.cite.tools.validation.specification.Specification; +import jakarta.validation.constraints.Size; +import org.opencdmp.commons.enums.PlanBlueprintStatus; +import org.opencdmp.commons.validation.BaseValidator; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.PlanBlueprintEntity; import org.opencdmp.errorcode.ErrorThesaurusProperties; -import org.opencdmp.model.persist.dmpblueprintdefinition.DefinitionPersist; -import jakarta.validation.constraints.Size; +import org.opencdmp.model.persist.planblueprintdefinition.DefinitionPersist; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Scope; @@ -26,11 +26,11 @@ public class PlanBlueprintPersist { public static final String _id = "id"; @Size(max = PlanBlueprintEntity._labelLength, message = "{validation.largerthanmax}") - private String label = null; + private String label; public static final String _label = "label"; - private DefinitionPersist definition = null; + private DefinitionPersist definition; public static final String _definition = "definition"; @@ -43,7 +43,7 @@ public class PlanBlueprintPersist { public static final String _hash = "hash"; public UUID getId() { - return id; + return this.id; } public void setId(UUID id) { @@ -51,7 +51,7 @@ public class PlanBlueprintPersist { } public String getLabel() { - return label; + return this.label; } public void setLabel(String label) { @@ -59,7 +59,7 @@ public class PlanBlueprintPersist { } public DefinitionPersist getDefinition() { - return definition; + return this.definition; } public void setDefinition(DefinitionPersist definition) { @@ -67,7 +67,7 @@ public class PlanBlueprintPersist { } public PlanBlueprintStatus getStatus() { - return status; + return this.status; } public void setStatus(PlanBlueprintStatus status) { @@ -75,7 +75,7 @@ public class PlanBlueprintPersist { } public String getHash() { - return hash; + return this.hash; } public void setHash(String hash) { @@ -109,26 +109,26 @@ public class PlanBlueprintPersist { this.spec() .iff(() -> this.isValidGuid(item.getId())) .must(() -> this.isValidHash(item.getHash())) - .failOn(PlanBlueprintPersist._hash).failWith(messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._hash}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._hash).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._hash}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> !this.isValidGuid(item.getId())) .must(() -> !this.isValidHash(item.getHash())) - .failOn(PlanBlueprintPersist._hash).failWith(messageSource.getMessage("Validation_OverPosting", new Object[]{}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._hash).failWith(this.messageSource.getMessage("Validation_OverPosting", new Object[]{}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isEmpty(item.getLabel())) - .failOn(PlanBlueprintPersist._label).failWith(messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._label}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._label).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._label}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> !this.isEmpty(item.getLabel())) .must(() -> this.lessEqualLength(item.getLabel(), PlanBlueprintEntity._labelLength)) - .failOn(PlanBlueprintPersist._label).failWith(messageSource.getMessage("Validation_MaxLength", new Object[]{PlanBlueprintPersist._label}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._label).failWith(this.messageSource.getMessage("Validation_MaxLength", new Object[]{PlanBlueprintPersist._label}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getStatus())) - .failOn(PlanBlueprintPersist._status).failWith(messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._status}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._status).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._status}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> item.getStatus() == PlanBlueprintStatus.Finalized) .must(() -> !this.isNull(item.getDefinition())) - .failOn(PlanBlueprintPersist._definition).failWith(messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._definition}, LocaleContextHolder.getLocale())), + .failOn(PlanBlueprintPersist._definition).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanBlueprintPersist._definition}, LocaleContextHolder.getLocale())), this.refSpec() .iff(() -> !this.isNull(item.getDefinition())) .on(PlanBlueprintPersist._definition) diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DefinitionPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DefinitionPersist.java similarity index 89% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DefinitionPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DefinitionPersist.java index 205efa2bc..d08dbf966 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DefinitionPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DefinitionPersist.java @@ -1,8 +1,8 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; -import org.opencdmp.commons.validation.BaseValidator; import gr.cite.tools.validation.ValidatorFactory; import gr.cite.tools.validation.specification.Specification; +import org.opencdmp.commons.validation.BaseValidator; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -16,12 +16,12 @@ import java.util.List; public class DefinitionPersist { - private List sections = null; + private List sections; public static final String _sections = "sections"; public List getSections() { - return sections; + return this.sections; } public void setSections(List sections) { @@ -57,7 +57,7 @@ public class DefinitionPersist { return Arrays.asList( this.spec() .must(() -> !this.isListNullOrEmpty(item.getSections())) - .failOn(DefinitionPersist._sections).failWith(messageSource.getMessage("Validation_Required", new Object[]{DefinitionPersist._sections}, LocaleContextHolder.getLocale())), + .failOn(DefinitionPersist._sections).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{DefinitionPersist._sections}, LocaleContextHolder.getLocale())), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getSections())) .on(DefinitionPersist._sections) diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DescriptionTemplatePersist.java similarity index 78% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DescriptionTemplatePersist.java index a81e17910..b4ec7816b 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/DescriptionTemplatePersist.java @@ -1,7 +1,7 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; -import org.opencdmp.commons.validation.BaseValidator; import gr.cite.tools.validation.specification.Specification; +import org.opencdmp.commons.validation.BaseValidator; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -16,24 +16,24 @@ import java.util.UUID; public class DescriptionTemplatePersist { - private UUID descriptionTemplateGroupId = null; + private UUID descriptionTemplateGroupId; public static final String _descriptionTemplateGroupId = "descriptionTemplateGroupId"; - private String label = null; + private String label; public static final String _label = "label"; - private Integer minMultiplicity = null; + private Integer minMultiplicity; public static final String _minMultiplicity = "minMultiplicity"; - private Integer maxMultiplicity = null; + private Integer maxMultiplicity; public static final String _maxMultiplicity = "maxMultiplicity"; public UUID getDescriptionTemplateGroupId() { - return descriptionTemplateGroupId; + return this.descriptionTemplateGroupId; } public void setDescriptionTemplateGroupId(UUID descriptionTemplateGroupId) { @@ -41,7 +41,7 @@ public class DescriptionTemplatePersist { } public String getLabel() { - return label; + return this.label; } public void setLabel(String label) { @@ -49,7 +49,7 @@ public class DescriptionTemplatePersist { } public Integer getMinMultiplicity() { - return minMultiplicity; + return this.minMultiplicity; } public void setMinMultiplicity(Integer minMultiplicity) { @@ -57,7 +57,7 @@ public class DescriptionTemplatePersist { } public Integer getMaxMultiplicity() { - return maxMultiplicity; + return this.maxMultiplicity; } public void setMaxMultiplicity(Integer maxMultiplicity) { @@ -87,15 +87,15 @@ public class DescriptionTemplatePersist { return Arrays.asList( this.spec() .must(() -> this.isValidGuid(item.getDescriptionTemplateGroupId())) - .failOn(DescriptionTemplatePersist._descriptionTemplateGroupId).failWith(messageSource.getMessage("Validation_Required", new Object[]{DescriptionTemplatePersist._descriptionTemplateGroupId}, LocaleContextHolder.getLocale())), + .failOn(DescriptionTemplatePersist._descriptionTemplateGroupId).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{DescriptionTemplatePersist._descriptionTemplateGroupId}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> !this.isNull(item.getMinMultiplicity())) .must(() -> item.getMinMultiplicity() >= 0) - .failOn(DescriptionTemplatePersist._minMultiplicity).failWith(messageSource.getMessage("Validation_UnexpectedValue", new Object[]{DescriptionTemplatePersist._minMultiplicity}, LocaleContextHolder.getLocale())), + .failOn(DescriptionTemplatePersist._minMultiplicity).failWith(this.messageSource.getMessage("Validation_UnexpectedValue", new Object[]{DescriptionTemplatePersist._minMultiplicity}, LocaleContextHolder.getLocale())), this.spec() .iff(() -> !this.isNull(item.getMaxMultiplicity())) .must(() -> item.getMaxMultiplicity() > 0) - .failOn(DescriptionTemplatePersist._maxMultiplicity).failWith(messageSource.getMessage("Validation_UnexpectedValue", new Object[]{DescriptionTemplatePersist._maxMultiplicity}, LocaleContextHolder.getLocale())) + .failOn(DescriptionTemplatePersist._maxMultiplicity).failWith(this.messageSource.getMessage("Validation_UnexpectedValue", new Object[]{DescriptionTemplatePersist._maxMultiplicity}, LocaleContextHolder.getLocale())) ); } } diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ExtraFieldPersist.java similarity index 82% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ExtraFieldPersist.java index 6d4bf9373..95907128f 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ExtraFieldPersist.java @@ -1,7 +1,7 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; -import org.opencdmp.commons.enums.PlanBlueprintExtraFieldDataType; import gr.cite.tools.validation.specification.Specification; +import org.opencdmp.commons.enums.PlanBlueprintExtraFieldDataType; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -20,7 +20,7 @@ public class ExtraFieldPersist extends FieldPersist { public static final String _dataType = "dataType"; public PlanBlueprintExtraFieldDataType getDataType() { - return dataType; + return this.dataType; } public void setDataType(PlanBlueprintExtraFieldDataType dataType) { @@ -44,14 +44,14 @@ public class ExtraFieldPersist extends FieldPersist { @Override protected List specifications(ExtraFieldPersist item) { - List specifications = getBaseSpecifications(item); + List specifications = this.getBaseSpecifications(item); specifications.addAll(Arrays.asList( this.spec() .must(() -> !this.isEmpty(item.getLabel())) - .failOn(FieldPersist._label).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._label}, LocaleContextHolder.getLocale())), + .failOn(FieldPersist._label).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._label}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getDataType())) - .failOn(ExtraFieldPersist._dataType).failWith(messageSource.getMessage("Validation_Required", new Object[]{ExtraFieldPersist._dataType}, LocaleContextHolder.getLocale())) + .failOn(ExtraFieldPersist._dataType).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{ExtraFieldPersist._dataType}, LocaleContextHolder.getLocale())) )); return specifications; } diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/FieldPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/FieldPersist.java similarity index 78% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/FieldPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/FieldPersist.java index 99f2905e8..c4826f051 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/FieldPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/FieldPersist.java @@ -1,10 +1,10 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import gr.cite.tools.validation.specification.Specification; import org.opencdmp.commons.enums.PlanBlueprintFieldCategory; import org.opencdmp.commons.validation.BaseValidator; -import gr.cite.tools.validation.specification.Specification; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.context.MessageSource; @@ -27,7 +27,7 @@ import java.util.UUID; }) public abstract class FieldPersist { - private UUID id = null; + private UUID id; public static final String _id = "id"; @@ -35,29 +35,29 @@ public abstract class FieldPersist { public static final String _category = "category"; - private String label = null; + private String label; public static final String _label = "label"; - private String placeholder = null; + private String placeholder; public static final String _placeholder = "placeholder"; private String description; - private List semantics = null; + private List semantics; public final static String _semantics = "semantics"; - private Integer ordinal = null; + private Integer ordinal; public static final String _ordinal = "ordinal"; - private Boolean required = null; + private Boolean required; public static final String _required = "required"; public UUID getId() { - return id; + return this.id; } public void setId(UUID id) { @@ -65,7 +65,7 @@ public abstract class FieldPersist { } public PlanBlueprintFieldCategory getCategory() { - return category; + return this.category; } public void setCategory(PlanBlueprintFieldCategory category) { @@ -73,7 +73,7 @@ public abstract class FieldPersist { } public String getLabel() { - return label; + return this.label; } public void setLabel(String label) { @@ -81,7 +81,7 @@ public abstract class FieldPersist { } public String getPlaceholder() { - return placeholder; + return this.placeholder; } public void setPlaceholder(String placeholder) { @@ -89,7 +89,7 @@ public abstract class FieldPersist { } public List getSemantics() { - return semantics; + return this.semantics; } public void setSemantics(List semantics) { @@ -97,7 +97,7 @@ public abstract class FieldPersist { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -105,7 +105,7 @@ public abstract class FieldPersist { } public Integer getOrdinal() { - return ordinal; + return this.ordinal; } public void setOrdinal(Integer ordinal) { @@ -113,7 +113,7 @@ public abstract class FieldPersist { } public Boolean getRequired() { - return required; + return this.required; } public void setRequired(Boolean required) { @@ -134,16 +134,16 @@ public abstract class FieldPersist { specifications.addAll( Arrays.asList( this.spec() .must(() -> this.isValidGuid(item.getId())) - .failOn(FieldPersist._id).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._id}, LocaleContextHolder.getLocale())), + .failOn(FieldPersist._id).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._id}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getCategory())) - .failOn(FieldPersist._category).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._category}, LocaleContextHolder.getLocale())), + .failOn(FieldPersist._category).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._category}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getOrdinal())) - .failOn(FieldPersist._ordinal).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._ordinal}, LocaleContextHolder.getLocale())), + .failOn(FieldPersist._ordinal).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._ordinal}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getRequired())) - .failOn(FieldPersist._required).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._required}, LocaleContextHolder.getLocale())) + .failOn(FieldPersist._required).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._required}, LocaleContextHolder.getLocale())) )); return specifications; } diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ReferenceTypeFieldPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ReferenceTypeFieldPersist.java similarity index 81% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ReferenceTypeFieldPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ReferenceTypeFieldPersist.java index e3c0eb963..b4429e5af 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/ReferenceTypeFieldPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/ReferenceTypeFieldPersist.java @@ -1,8 +1,8 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; +import gr.cite.tools.validation.specification.Specification; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; -import gr.cite.tools.validation.specification.Specification; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Scope; @@ -25,7 +25,7 @@ public class ReferenceTypeFieldPersist extends FieldPersist { public UUID getReferenceTypeId() { - return referenceTypeId; + return this.referenceTypeId; } public void setReferenceTypeId(UUID referenceTypeId) { @@ -33,7 +33,7 @@ public class ReferenceTypeFieldPersist extends FieldPersist { } public Boolean getMultipleSelect() { - return multipleSelect; + return this.multipleSelect; } public void setMultipleSelect(Boolean multipleSelect) { @@ -57,14 +57,14 @@ public class ReferenceTypeFieldPersist extends FieldPersist { @Override protected List specifications(ReferenceTypeFieldPersist item) { - List specifications = getBaseSpecifications(item); + List specifications = this.getBaseSpecifications(item); specifications.addAll(Arrays.asList( this.spec() .must(() -> !this.isNull(item.getReferenceTypeId())) - .failOn(ReferenceTypeFieldPersist._referenceTypeId).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferenceTypeFieldPersist._referenceTypeId}, LocaleContextHolder.getLocale())), + .failOn(ReferenceTypeFieldPersist._referenceTypeId).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{ReferenceTypeFieldPersist._referenceTypeId}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getMultipleSelect())) - .failOn(ReferenceTypeFieldPersist._multipleSelect).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferenceTypeFieldPersist._multipleSelect}, LocaleContextHolder.getLocale()))) + .failOn(ReferenceTypeFieldPersist._multipleSelect).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{ReferenceTypeFieldPersist._multipleSelect}, LocaleContextHolder.getLocale()))) ); return specifications; diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SectionPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java similarity index 83% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SectionPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java index eabcf2844..956610f39 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SectionPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SectionPersist.java @@ -1,9 +1,9 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; -import org.opencdmp.commons.validation.BaseValidator; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.validation.ValidatorFactory; import gr.cite.tools.validation.specification.Specification; +import org.opencdmp.commons.validation.BaseValidator; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -19,38 +19,38 @@ import java.util.stream.Collectors; public class SectionPersist { - private UUID id = null; + private UUID id; public static final String _id = "id"; private String description; - private String label = null; + private String label; public static final String _label = "label"; - private Integer ordinal = null; + private Integer ordinal; public static final String _ordinal = "ordinal"; - private Boolean hasTemplates = null; + private Boolean hasTemplates; public static final String _hasTemplates = "hasTemplates"; - private List fields = null; + private List fields; public static final String _fields = "fields"; - private List descriptionTemplates = null; + private List descriptionTemplates; public static final String _descriptionTemplates = "descriptionTemplates"; - private List prefillingSourcesIds= null; + private List prefillingSourcesIds; public static final String _prefillingSourcesIds = "prefillingSourcesIds"; public UUID getId() { - return id; + return this.id; } public void setId(UUID id) { @@ -58,7 +58,7 @@ public class SectionPersist { } public String getLabel() { - return label; + return this.label; } public void setLabel(String label) { @@ -66,7 +66,7 @@ public class SectionPersist { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -74,7 +74,7 @@ public class SectionPersist { } public Integer getOrdinal() { - return ordinal; + return this.ordinal; } public void setOrdinal(Integer ordinal) { @@ -82,7 +82,7 @@ public class SectionPersist { } public Boolean getHasTemplates() { - return hasTemplates; + return this.hasTemplates; } public void setHasTemplates(Boolean hasTemplates) { @@ -90,7 +90,7 @@ public class SectionPersist { } public List getFields() { - return fields; + return this.fields; } public void setFields(List fields) { @@ -98,7 +98,7 @@ public class SectionPersist { } public List getDescriptionTemplates() { - return descriptionTemplates; + return this.descriptionTemplates; } public void setDescriptionTemplates(List descriptionTemplates) { @@ -106,7 +106,7 @@ public class SectionPersist { } public List getPrefillingSourcesIds() { - return prefillingSourcesIds; + return this.prefillingSourcesIds; } public void setPrefillingSourcesIds(List prefillingSourcesIds) { @@ -139,16 +139,16 @@ public class SectionPersist { return Arrays.asList( this.spec() .must(() -> this.isValidGuid(item.getId())) - .failOn(SectionPersist._id).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._id}, LocaleContextHolder.getLocale())), + .failOn(SectionPersist._id).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._id}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isEmpty(item.getLabel())) - .failOn(SectionPersist._label).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._label}, LocaleContextHolder.getLocale())), + .failOn(SectionPersist._label).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._label}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getOrdinal())) - .failOn(SectionPersist._ordinal).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._ordinal}, LocaleContextHolder.getLocale())), + .failOn(SectionPersist._ordinal).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._ordinal}, LocaleContextHolder.getLocale())), this.spec() .must(() -> !this.isNull(item.getHasTemplates())) - .failOn(SectionPersist._hasTemplates).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._hasTemplates}, LocaleContextHolder.getLocale())), + .failOn(SectionPersist._hasTemplates).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._hasTemplates}, LocaleContextHolder.getLocale())), this.navSpec() .iff(() -> !this.isListNullOrEmpty(item.getFields())) .on(SectionPersist._fields) @@ -175,7 +175,7 @@ public class SectionPersist { this.spec() .iff(() -> !this.isListNullOrEmpty(item.getDescriptionTemplates())) .must(() -> item.getDescriptionTemplates().stream().map(DescriptionTemplatePersist::getDescriptionTemplateGroupId).distinct().collect(Collectors.toList()).size() == item.getDescriptionTemplates().size()) - .failOn(SectionPersist._descriptionTemplates).failWith(messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())) + .failOn(SectionPersist._descriptionTemplates).failWith(this.messageSource.getMessage("Validation_Unique", new Object[]{SectionPersist._descriptionTemplates}, LocaleContextHolder.getLocale())) ); } diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SystemFieldPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SystemFieldPersist.java similarity index 85% rename from backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SystemFieldPersist.java rename to backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SystemFieldPersist.java index ee15c62e5..6e384827f 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/dmpblueprintdefinition/SystemFieldPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/planblueprintdefinition/SystemFieldPersist.java @@ -1,7 +1,7 @@ -package org.opencdmp.model.persist.dmpblueprintdefinition; +package org.opencdmp.model.persist.planblueprintdefinition; -import org.opencdmp.commons.enums.PlanBlueprintSystemFieldType; import gr.cite.tools.validation.specification.Specification; +import org.opencdmp.commons.enums.PlanBlueprintSystemFieldType; import org.opencdmp.convention.ConventionService; import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -19,7 +19,7 @@ public class SystemFieldPersist extends FieldPersist { public static final String _systemFieldType = "systemFieldType"; public PlanBlueprintSystemFieldType getSystemFieldType() { - return systemFieldType; + return this.systemFieldType; } public void setSystemFieldType(PlanBlueprintSystemFieldType systemFieldType) { @@ -43,11 +43,11 @@ public class SystemFieldPersist extends FieldPersist { @Override protected List specifications(SystemFieldPersist item) { - List specifications = getBaseSpecifications(item); + List specifications = this.getBaseSpecifications(item); specifications.add( this.spec() .must(() -> !this.isNull(item.getSystemFieldType())) - .failOn(SystemFieldPersist._systemFieldType).failWith(messageSource.getMessage("Validation_Required", new Object[]{SystemFieldPersist._systemFieldType}, LocaleContextHolder.getLocale())) + .failOn(SystemFieldPersist._systemFieldType).failWith(this.messageSource.getMessage("Validation_Required", new Object[]{SystemFieldPersist._systemFieldType}, LocaleContextHolder.getLocale())) ); return specifications; } diff --git a/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java index ec1bc973f..bd8b8abd7 100644 --- a/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/planblueprint/PlanBlueprintServiceImpl.java @@ -33,13 +33,13 @@ import org.opencdmp.errorcode.ErrorThesaurusProperties; import org.opencdmp.model.builder.planblueprint.PlanBlueprintBuilder; import org.opencdmp.model.deleter.PlanBlueprintDeleter; import org.opencdmp.model.descriptiontemplate.DescriptionTemplate; -import org.opencdmp.model.planblueprint.Definition; -import org.opencdmp.model.planblueprint.PlanBlueprint; -import org.opencdmp.model.planblueprint.Field; -import org.opencdmp.model.planblueprint.Section; -import org.opencdmp.model.persist.PlanBlueprintPersist; import org.opencdmp.model.persist.NewVersionPlanBlueprintPersist; -import org.opencdmp.model.persist.dmpblueprintdefinition.*; +import org.opencdmp.model.persist.PlanBlueprintPersist; +import org.opencdmp.model.persist.planblueprintdefinition.*; +import org.opencdmp.model.planblueprint.Definition; +import org.opencdmp.model.planblueprint.Field; +import org.opencdmp.model.planblueprint.PlanBlueprint; +import org.opencdmp.model.planblueprint.Section; import org.opencdmp.model.prefillingsource.PrefillingSource; import org.opencdmp.model.referencetype.ReferenceType; import org.opencdmp.query.DescriptionTemplateQuery; diff --git a/backend/web/src/main/java/org/opencdmp/controllers/PlanController.java b/backend/web/src/main/java/org/opencdmp/controllers/PlanController.java index 21dd17228..41a5d14e2 100644 --- a/backend/web/src/main/java/org/opencdmp/controllers/PlanController.java +++ b/backend/web/src/main/java/org/opencdmp/controllers/PlanController.java @@ -146,15 +146,11 @@ public class PlanController { } @PostMapping("query") - @OperationWithTenantHeader(summary = "Query all plans", description = SwaggerHelpers.Plan.endpoint_query, requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(description = SwaggerHelpers.Plan.endpoint_query_request_body, content = @Content( - examples = { - @ExampleObject( - name = "Pagination and projection", - description = "Simple paginated request using a property projection list and pagination info", - value = SwaggerHelpers.Plan.endpoint_query_request_body_example - ) - } - )), responses = @ApiResponse(description = "OK", responseCode = "200", content = @Content( + @OperationWithTenantHeader(summary = "Query all plans", description = SwaggerHelpers.Plan.endpoint_query, requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(description = SwaggerHelpers.Plan.endpoint_query_request_body, content = @Content(examples = @ExampleObject( + name = "Pagination and projection", + description = "Simple paginated request using a property projection list and pagination info", + value = SwaggerHelpers.Plan.endpoint_query_request_body_example + ))), responses = @ApiResponse(description = "OK", responseCode = "200", content = @Content( array = @ArraySchema( schema = @Schema( implementation = Plan.class