From f09e031e0cc3d5be3e5717f4d3407e3615cc85de Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Tue, 19 Dec 2023 15:46:31 +0200 Subject: [PATCH] move old validation logic --- .../commons/validation/AbstractValidator.java | 115 ++++++++++++++++++ .../commons/validation/BaseValidator.java | 112 +---------------- .../validation/{ => old}/EnumNotNull.java | 2 +- .../{ => old}/FieldNotNullIfOtherSet.java | 2 +- .../FieldNotNullIfOtherSetValidator.java | 3 +- .../{ => old}/FieldsValueMatch.java | 2 +- .../{ => old}/FieldsValueMatchValidator.java | 3 +- .../{ => old}/RequiredOneField.java | 2 +- .../{ => old}/RequiredOneFieldValidator.java | 3 +- .../validation/{ => old}/ValidEnum.java | 3 +- .../commons/validation/{ => old}/ValidId.java | 2 +- .../{ => old}/ValidIdValidator.java | 3 +- .../{ => old}/ValidationServiceImpl.java | 2 +- .../persist/ActionConfirmationPersist.java | 6 +- .../eudat/model/persist/CloneDmpPersist.java | 2 +- .../model/persist/DescriptionPersist.java | 6 +- .../persist/DescriptionReferencePersist.java | 11 +- .../persist/DescriptionStatusPersist.java | 11 +- .../persist/DescriptionTemplatePersist.java | 10 +- .../DescriptionTemplateTypePersist.java | 3 - .../model/persist/DmpBlueprintPersist.java | 7 +- .../DmpDescriptionTemplatePersist.java | 4 +- .../eu/eudat/model/persist/DmpPersist.java | 7 +- .../model/persist/DmpReferencePersist.java | 4 +- .../model/persist/DmpUserInvitePersist.java | 2 +- .../persist/DmpUserInviteTypePersist.java | 2 +- .../model/persist/DmpUserRemovePersist.java | 13 +- .../eudat/model/persist/EntityDoiPersist.java | 4 +- .../eudat/model/persist/LanguagePersist.java | 2 +- .../eu/eudat/model/persist/LockPersist.java | 6 +- .../NewVersionDescriptionTemplatePersist.java | 6 +- .../model/persist/NewVersionDmpPersist.java | 4 +- .../eudat/model/persist/ReferencePersist.java | 6 +- .../model/persist/ReferenceTypePersist.java | 4 +- .../model/persist/StorageFilePersist.java | 2 +- .../persist/SupportiveMaterialPersist.java | 5 +- .../eu/eudat/model/persist/TenantPersist.java | 4 +- .../persist/UserAdditionalInfoPersist.java | 2 +- .../UserDescriptionTemplatePersist.java | 6 +- .../eu/eudat/model/persist/UserPersist.java | 15 +-- .../model/persist/UserRolePatchPersist.java | 8 +- .../model/persist/UserSettingsPersist.java | 4 +- .../DmpInvitationPersist.java | 6 +- .../model/persist/deposit/DepositRequest.java | 2 +- .../AutoCompleteSingleDataPersist.java | 2 +- .../fielddata/BaseFieldDataPersist.java | 2 +- .../fielddata/ExternalDatasetDataPersist.java | 2 +- .../DescriptionTemplatePersist.java | 2 +- .../ExtraFieldPersist.java | 2 +- .../dmpblueprintdefinition/FieldPersist.java | 4 +- .../SectionPersist.java | 2 +- .../SystemFieldPersist.java | 2 +- .../notification/NotificationPersist.java | 4 +- .../referencedefinition/FieldPersist.java | 2 +- .../AuthenticationConfigurationPersist.java | 2 +- .../ReferenceTypeFieldPersist.java | 2 +- ...nceTypeSourceBaseConfigurationPersist.java | 2 +- ...SourceExternalApiConfigurationPersist.java | 3 +- 58 files changed, 211 insertions(+), 250 deletions(-) create mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/EnumNotNull.java (88%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/FieldNotNullIfOtherSet.java (93%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/FieldNotNullIfOtherSetValidator.java (91%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/FieldsValueMatch.java (94%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/FieldsValueMatchValidator.java (89%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/RequiredOneField.java (91%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/RequiredOneFieldValidator.java (91%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/ValidEnum.java (81%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/ValidId.java (90%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/ValidIdValidator.java (92%) rename dmp-backend/core/src/main/java/eu/eudat/commons/validation/{ => old}/ValidationServiceImpl.java (96%) diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java new file mode 100644 index 000000000..c45e7d282 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java @@ -0,0 +1,115 @@ +package eu.eudat.commons.validation; + +import eu.eudat.commons.validation.specification.*; +import eu.eudat.convention.ConventionService; +import eu.eudat.errorcode.ErrorThesaurusProperties; +import gr.cite.tools.exception.MyValidationException; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.Errors; +import org.springframework.validation.FieldError; +import org.springframework.validation.ValidationUtils; + +import java.text.MessageFormat; +import java.util.*; + +public abstract class AbstractValidator implements Validator { + private BeanPropertyBindingResult bindingResult; + + protected abstract Class modelClass(); + + protected abstract List specifications(T item); + + @Override + public boolean supports(Class clazz) { + return clazz == null ? false : this.modelClass().equals(clazz); + } + + @Override + public void validate(Object obj, Errors e) { + if (obj == null) return; + T item = this.modelClass().cast(obj); + List specifications = this.specifications(item); + if (specifications == null) return;; + List propertySpecifications = specifications.stream().filter(x-> x instanceof PropertySpecification).map(x-> (PropertySpecification)x).toList(); + for (PropertySpecification propertySpecification : propertySpecifications){ + if ((propertySpecification.getPrecondition() == null || propertySpecification.getPrecondition().get()) && + (propertySpecification.getSpecification() == null || !propertySpecification.getSpecification().get()) + ){ + e.rejectValue(propertySpecification.getErrorKey(), propertySpecification.getErrorCode(), propertySpecification.getErrorMessage()); + } + } + + List navigationReferenceSpecifications = specifications.stream().filter(x-> x instanceof NavigationReferenceSpecification).map(x-> (NavigationReferenceSpecification)x).toList(); + for (NavigationReferenceSpecification navigationReferenceSpecification : navigationReferenceSpecifications){ + if (navigationReferenceSpecification.getReference() != null && (navigationReferenceSpecification.getPrecondition() == null || navigationReferenceSpecification.getPrecondition().get())){ + try { + e.pushNestedPath(navigationReferenceSpecification.getKey()); + ValidationUtils.invokeValidator(navigationReferenceSpecification.getValidator().get(), navigationReferenceSpecification.getReference(), e); + } finally { + e.popNestedPath(); + } + } + } + + List navigationDetailsSpecifications = specifications.stream().filter(x-> x instanceof NavigationDetailsSpecification).map(x-> (NavigationDetailsSpecification)x).toList(); + for (NavigationDetailsSpecification navigationDetailsSpecification : navigationDetailsSpecifications){ + if (navigationDetailsSpecification.getDetails() != null && (navigationDetailsSpecification.getPrecondition() == null || navigationDetailsSpecification.getPrecondition().get())){ + + for (int i = 0; i < navigationDetailsSpecification.getDetails().size(); i++) { + try { + e.pushNestedPath(MessageFormat.format("{0}[{1}]", navigationDetailsSpecification.getKey(), i)); + ValidationUtils.invokeValidator(navigationDetailsSpecification.getValidator().get(), navigationDetailsSpecification.getDetails().get(i), e); + } finally { + e.popNestedPath(); + } + } + } + } + } + + @Override + public void validate(Object target){ + this.bindingResult = new BeanPropertyBindingResult(target, target.getClass().getName()); + this.validate(target, this.bindingResult); + } + + @Override + public ValidationResult result() { + ValidationResult validationResult = new ValidationResult(); + if (this.bindingResult != null && bindingResult.hasErrors()){ + for (FieldError fieldError : bindingResult.getFieldErrors()){ + validationResult.add(new ValidationFailure(fieldError.getField(), fieldError.getDefaultMessage())); + } + } + return validationResult; + } + + protected List>> flattenValidationResult() { + ValidationResult result = result(); + List>> errorsMap = new ArrayList<>(); + for (ValidationFailure fieldError : result.getErrors()){ + Map.Entry> entry = errorsMap.stream().filter(x-> Objects.equals(x.getKey(), fieldError.getErrorKey())).findFirst().orElse(null); + if (entry == null) { + entry = new AbstractMap.SimpleEntry<>(fieldError.getErrorKey(), new ArrayList<>()); + errorsMap.add(entry); + } + entry.getValue().add(fieldError.getErrorMessage()); + } + + return errorsMap; + } + + protected PropertySpecificationBuilder spec() { + return new PropertySpecificationBuilder(); + } + + protected NavigationReferenceSpecificationBuilder refSpec() { + return new NavigationReferenceSpecificationBuilder(); + } + + protected NavigationDetailsSpecificationBuilder navSpec() + { + return new NavigationDetailsSpecificationBuilder(); + } +} + diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java index 1d8644200..829cfdd30 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java @@ -1,19 +1,11 @@ package eu.eudat.commons.validation; -import eu.eudat.commons.validation.specification.*; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyValidationException; -import org.springframework.validation.BeanPropertyBindingResult; -import org.springframework.validation.Errors; -import org.springframework.validation.FieldError; -import org.springframework.validation.ValidationUtils; - -import java.text.MessageFormat; import java.util.*; -public abstract class BaseValidator implements Validator { - private BeanPropertyBindingResult bindingResult; +public abstract class BaseValidator extends AbstractValidator { protected final ConventionService conventionService; protected final ErrorThesaurusProperties errors; @@ -21,117 +13,17 @@ public abstract class BaseValidator implements Validator { this.conventionService = conventionService; this.errors = errors; } - - protected abstract Class modelClass(); - - protected abstract List specifications(T item); - - @Override - public boolean supports(Class clazz) { - return clazz == null ? false : this.modelClass().equals(clazz); - } - - @Override - public void validate(Object obj, Errors e) { - if (obj == null) return; - T item = this.modelClass().cast(obj); - List specifications = this.specifications(item); - if (specifications == null) return;; - List propertySpecifications = specifications.stream().filter(x-> x instanceof PropertySpecification).map(x-> (PropertySpecification)x).toList(); - for (PropertySpecification propertySpecification : propertySpecifications){ - if ((propertySpecification.getPrecondition() == null || propertySpecification.getPrecondition().get()) && - (propertySpecification.getSpecification() == null || !propertySpecification.getSpecification().get()) - ){ - e.rejectValue(propertySpecification.getErrorKey(), propertySpecification.getErrorCode(), propertySpecification.getErrorMessage()); - } - } - - List navigationReferenceSpecifications = specifications.stream().filter(x-> x instanceof NavigationReferenceSpecification).map(x-> (NavigationReferenceSpecification)x).toList(); - for (NavigationReferenceSpecification navigationReferenceSpecification : navigationReferenceSpecifications){ - if (navigationReferenceSpecification.getReference() != null && (navigationReferenceSpecification.getPrecondition() == null || navigationReferenceSpecification.getPrecondition().get())){ - try { - e.pushNestedPath(navigationReferenceSpecification.getKey()); - ValidationUtils.invokeValidator(navigationReferenceSpecification.getValidator().get(), navigationReferenceSpecification.getReference(), e); - } finally { - e.popNestedPath(); - } - } - } - - List navigationDetailsSpecifications = specifications.stream().filter(x-> x instanceof NavigationDetailsSpecification).map(x-> (NavigationDetailsSpecification)x).toList(); - for (NavigationDetailsSpecification navigationDetailsSpecification : navigationDetailsSpecifications){ - if (navigationDetailsSpecification.getDetails() != null && (navigationDetailsSpecification.getPrecondition() == null || navigationDetailsSpecification.getPrecondition().get())){ - - for (int i = 0; i < navigationDetailsSpecification.getDetails().size(); i++) { - try { - e.pushNestedPath(MessageFormat.format("{0}[{1}]", navigationDetailsSpecification.getKey(), i)); - ValidationUtils.invokeValidator(navigationDetailsSpecification.getValidator().get(), navigationDetailsSpecification.getDetails().get(i), e); - } finally { - e.popNestedPath(); - } - } - } - } - } - - @Override - public void validate(Object target){ - this.bindingResult = new org.springframework.validation.BeanPropertyBindingResult(target, target.getClass().getName()); - this.validate(target, this.bindingResult); - } @Override public void validateForce(Object target) { this.validate(target); ValidationResult result = result(); - if (!result.isValid()){ + if (!result.isValid()) { List>> errorsMap = this.flattenValidationResult(); throw new MyValidationException(this.errors.getModelValidation().getCode(), errorsMap); } - } - protected List>> flattenValidationResult() { - ValidationResult result = result(); - List>> errorsMap = new ArrayList<>(); - for (ValidationFailure fieldError : result.getErrors()){ - Map.Entry> entry = errorsMap.stream().filter(x-> Objects.equals(x.getKey(), fieldError.getErrorKey())).findFirst().orElse(null); - if (entry == null) { - entry = new AbstractMap.SimpleEntry<>(fieldError.getErrorKey(), new ArrayList<>()); - errorsMap.add(entry); - } - entry.getValue().add(fieldError.getErrorMessage()); - } - - return errorsMap; - } - - protected PropertySpecificationBuilder spec() { - return new PropertySpecificationBuilder(); - } - - protected NavigationReferenceSpecificationBuilder refSpec() { - return new NavigationReferenceSpecificationBuilder(); - } - - protected NavigationDetailsSpecificationBuilder navSpec() - { - return new NavigationDetailsSpecificationBuilder(); - } - - @Override - public ValidationResult result() { - ValidationResult validationResult = new ValidationResult(); - if (this.bindingResult != null && bindingResult.hasErrors()){ - for (FieldError fieldError : bindingResult.getFieldErrors()){ - validationResult.add(new ValidationFailure(fieldError.getField(), fieldError.getDefaultMessage())); - } - } - return validationResult; - } - - - protected Boolean isValidGuid(UUID guid) { return this.conventionService.isValidGuid(guid); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/EnumNotNull.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/EnumNotNull.java similarity index 88% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/EnumNotNull.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/EnumNotNull.java index ffa2553b5..94003e578 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/EnumNotNull.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/EnumNotNull.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSet.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSet.java similarity index 93% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSet.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSet.java index 2b3893879..3014f1792 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSet.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSet.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import jakarta.validation.Constraint; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSetValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSetValidator.java similarity index 91% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSetValidator.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSetValidator.java index 1b55849f5..7bcd6acac 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldNotNullIfOtherSetValidator.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldNotNullIfOtherSetValidator.java @@ -1,5 +1,6 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; import org.springframework.beans.BeanWrapperImpl; import jakarta.validation.ConstraintValidator; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatch.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatch.java similarity index 94% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatch.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatch.java index d08df40d0..5b411fe58 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatch.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatch.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatchValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatchValidator.java similarity index 89% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatchValidator.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatchValidator.java index 1f4691378..7706cd483 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/FieldsValueMatchValidator.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/FieldsValueMatchValidator.java @@ -1,5 +1,6 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; +import eu.eudat.commons.validation.old.FieldsValueMatch; import org.springframework.beans.BeanWrapperImpl; import jakarta.validation.ConstraintValidator; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneField.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneField.java similarity index 91% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneField.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneField.java index 1c42ea6f4..c461f924a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneField.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneField.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneFieldValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneFieldValidator.java similarity index 91% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneFieldValidator.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneFieldValidator.java index 6b1cc6c5f..b999b9470 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/RequiredOneFieldValidator.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/RequiredOneFieldValidator.java @@ -1,5 +1,6 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; +import eu.eudat.commons.validation.old.RequiredOneField; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.beanutils.PropertyUtils; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidEnum.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidEnum.java similarity index 81% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidEnum.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidEnum.java index 079f9e64a..ce0c8f125 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidEnum.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidEnum.java @@ -1,5 +1,6 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; +import eu.eudat.commons.validation.old.EnumNotNull; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.*; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidId.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidId.java similarity index 90% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidId.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidId.java index 2f470b57b..f8a9115d6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidId.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidId.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import jakarta.validation.Constraint; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidIdValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidIdValidator.java similarity index 92% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidIdValidator.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidIdValidator.java index 7fce85251..fa71ff4c8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidIdValidator.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidIdValidator.java @@ -1,5 +1,6 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.convention.ConventionService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidationServiceImpl.java similarity index 96% rename from dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationServiceImpl.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidationServiceImpl.java index 33cfa570c..a98561485 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/old/ValidationServiceImpl.java @@ -1,4 +1,4 @@ -package eu.eudat.commons.validation; +package eu.eudat.commons.validation.old; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyValidationException; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ActionConfirmationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ActionConfirmationPersist.java index 1f1240064..b1993da53 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ActionConfirmationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ActionConfirmationPersist.java @@ -2,9 +2,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.ActionConfirmationStatus; import eu.eudat.commons.enums.ActionConfirmationType; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.model.persist.actionconfirmation.DmpInvitationPersist; import eu.eudat.model.persist.actionconfirmation.EmailConfirmationPersist; import jakarta.validation.Valid; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/CloneDmpPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/CloneDmpPersist.java index 1a34a8e96..3a4c80277 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/CloneDmpPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/CloneDmpPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import org.apache.commons.compress.utils.Lists; 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 af6a8c9e8..2332c235f 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 @@ -1,9 +1,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.DescriptionEntity; import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist; import jakarta.validation.Valid; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionReferencePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionReferencePersist.java index 070b39000..59ad3732b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionReferencePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionReferencePersist.java @@ -1,18 +1,11 @@ package eu.eudat.model.persist; -import eu.eudat.commons.enums.DescriptionTemplateStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DescriptionTemplateEntity; -import eu.eudat.model.persist.descriptiontemplatedefinition.DefinitionPersist; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import java.util.List; import java.util.UUID; @FieldNotNullIfOtherSet(message = "{validation.hashempty}") diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionStatusPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionStatusPersist.java index 7c092f29f..a9d623447 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionStatusPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionStatusPersist.java @@ -1,17 +1,12 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DescriptionEntity; -import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist; -import jakarta.validation.Valid; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import java.util.List; import java.util.UUID; @FieldNotNullIfOtherSet(message = "{validation.hashempty}") 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 a2a3b1b34..cde3040b5 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 @@ -2,19 +2,15 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateStatus; -import eu.eudat.commons.enums.UserDescriptionTemplateRole; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.model.persist.descriptiontemplatedefinition.DefinitionPersist; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; -import org.springframework.validation.Validator; import java.util.List; import java.util.UUID; 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 94c19c901..b3b960ec7 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 @@ -8,9 +8,6 @@ import eu.eudat.commons.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Scope; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpBlueprintPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpBlueprintPersist.java index 4bbd57818..e455736ef 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpBlueprintPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpBlueprintPersist.java @@ -1,11 +1,10 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpBlueprintStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.DmpBlueprintEntity; -import eu.eudat.model.dmpblueprintdefinition.Definition; import eu.eudat.model.persist.dmpblueprintdefinition.DefinitionPersist; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpDescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpDescriptionTemplatePersist.java index c34538289..1c5d12ce1 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpDescriptionTemplatePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpDescriptionTemplatePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotNull; import java.util.UUID; 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 f5b56a483..2c7d551f0 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 @@ -2,10 +2,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpAccessType; import eu.eudat.commons.enums.DmpStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DescriptionEntity; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.DmpEntity; import eu.eudat.model.persist.dmpproperties.DmpPropertiesPersist; import jakarta.validation.Valid; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpReferencePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpReferencePersist.java index bdb0209bf..0fac4da79 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpReferencePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpReferencePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 9eb8aa670..1b9a34e75 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 @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpUserRole; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInviteTypePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInviteTypePersist.java index 3d1fd7f4d..ee01ad183 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInviteTypePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserInviteTypePersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.RequiredOneField; +import eu.eudat.commons.validation.old.RequiredOneField; import java.util.UUID; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserRemovePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserRemovePersist.java index 20dc12ff3..11673e474 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserRemovePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserRemovePersist.java @@ -1,19 +1,10 @@ package eu.eudat.model.persist; -import eu.eudat.commons.enums.DmpAccessType; -import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.enums.DmpUserRole; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DmpEntity; -import eu.eudat.model.persist.dmpproperties.DmpPropertiesPersist; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import java.util.List; import java.util.UUID; public class DmpUserRemovePersist { diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/EntityDoiPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/EntityDoiPersist.java index 96d57d5d9..1db790df3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/EntityDoiPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/EntityDoiPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import java.util.UUID; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/LanguagePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/LanguagePersist.java index af86bab75..81d21f039 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/LanguagePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/LanguagePersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/LockPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/LockPersist.java index 1bbed6894..b62060408 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/LockPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/LockPersist.java @@ -1,9 +1,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.LockTargetType; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.Valid; import java.util.UUID; 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 e99902c99..c9adf070c 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 @@ -2,9 +2,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateStatus; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.model.persist.descriptiontemplatedefinition.DefinitionPersist; import jakarta.validation.Valid; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDmpPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDmpPersist.java index c0dbe35b1..d0b375a8f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDmpPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/NewVersionDmpPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import org.apache.commons.compress.utils.Lists; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java index 1c2efdb6b..694216cc5 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java @@ -2,9 +2,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.ReferenceType; import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.model.persist.referencedefinition.DefinitionPersist; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferenceTypePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferenceTypePersist.java index 195d521eb..0c65a0fe5 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferenceTypePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferenceTypePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.model.persist.referencetypedefinition.ReferenceTypeDefinitionPersist; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/StorageFilePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/StorageFilePersist.java index 55a8df9d2..62c73983d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/StorageFilePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/StorageFilePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.StorageType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import eu.eudat.data.StorageFileEntity; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/SupportiveMaterialPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/SupportiveMaterialPersist.java index 79fbcd2db..362f46a9b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/SupportiveMaterialPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/SupportiveMaterialPersist.java @@ -1,9 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.SupportiveMaterialFieldType; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DmpBlueprintEntity; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/TenantPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/TenantPersist.java index e9ddab198..4c1935883 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/TenantPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/TenantPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.model.persist.tenantconfig.TenantConfigPersist; import jakarta.validation.constraints.*; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserAdditionalInfoPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserAdditionalInfoPersist.java index 20744529e..34881a55d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserAdditionalInfoPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserAdditionalInfoPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserDescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserDescriptionTemplatePersist.java index cc5fb3ade..a829bf95e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserDescriptionTemplatePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserDescriptionTemplatePersist.java @@ -1,9 +1,9 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.UserDescriptionTemplateRole; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotNull; import java.util.UUID; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserPersist.java index 7f37c9865..f430d40b6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserPersist.java @@ -1,25 +1,14 @@ package eu.eudat.model.persist; -import eu.eudat.commons.enums.DescriptionTemplateTypeStatus; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.DescriptionEntity; -import eu.eudat.data.DescriptionTemplateTypeEntity; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import eu.eudat.data.UserEntity; -import eu.eudat.model.UserAdditionalInfo; -import eu.eudat.model.UserContactInfo; -import eu.eudat.model.UserCredential; -import eu.eudat.model.UserRole; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import java.time.Instant; -import java.util.List; import java.util.UUID; @FieldNotNullIfOtherSet(message = "{validation.hashempty}") 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 fceb1e87a..d8a821de8 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 @@ -1,13 +1,9 @@ package eu.eudat.model.persist; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; -import eu.eudat.data.UserEntity; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; import java.util.List; import java.util.UUID; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserSettingsPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserSettingsPersist.java index 2e065fd4f..09bc030db 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserSettingsPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserSettingsPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.UserSettingsType; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/DmpInvitationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/DmpInvitationPersist.java index e646bc8ce..4d1ef7688 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/DmpInvitationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/DmpInvitationPersist.java @@ -1,14 +1,10 @@ package eu.eudat.model.persist.actionconfirmation; import eu.eudat.commons.enums.DmpUserRole; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; import java.util.UUID; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositRequest.java index 09f737267..76dad069b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositRequest.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.deposit; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import gr.cite.tools.fieldset.BaseFieldSet; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java index 262083e6c..c300150cc 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 9ad85891d..f64f5eaee 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 @@ -3,7 +3,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.FieldType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 c345a7dab..6ade782c9 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.enums.FieldDataExternalDatasetType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.constraints.NotNull; public class ExternalDatasetDataPersist extends BaseFieldDataPersist { diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java index 781cb7fe3..f46e0aa67 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.dmpblueprintdefinition; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java index 296cc4ed3..566784fb9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/ExtraFieldPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import eu.eudat.commons.enums.DmpBlueprintExtraFieldDataType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; public class ExtraFieldPersist extends FieldPersist { diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java index 4b4c5363b..48a6308ca 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java @@ -3,8 +3,8 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.DmpBlueprintFieldCategory; -import eu.eudat.commons.validation.ValidEnum; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidEnum; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 3ae066faa..73809832a 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 @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpblueprintdefinition; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SystemFieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SystemFieldPersist.java index e160ba582..b2dfe1fe5 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SystemFieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/SystemFieldPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import eu.eudat.commons.enums.DmpBlueprintSystemFieldType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; public class SystemFieldPersist extends FieldPersist { @ValidEnum(message = "{validation.empty}") diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/notification/NotificationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/notification/NotificationPersist.java index 358556800..71228d9ad 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/notification/NotificationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/notification/NotificationPersist.java @@ -4,8 +4,8 @@ import eu.eudat.commons.enums.notification.NotificationContactType; import eu.eudat.commons.enums.notification.NotificationNotifyState; import eu.eudat.commons.enums.notification.NotificationTrackingProcess; import eu.eudat.commons.enums.notification.NotificationTrackingState; -import eu.eudat.commons.validation.FieldNotNullIfOtherSet; -import eu.eudat.commons.validation.ValidId; +import eu.eudat.commons.validation.old.FieldNotNullIfOtherSet; +import eu.eudat.commons.validation.old.ValidId; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/FieldPersist.java index 0a53aaadc..5acd9eb51 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/FieldPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencedefinition; import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/AuthenticationConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/AuthenticationConfigurationPersist.java index f3045b42d..75a718ede 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/AuthenticationConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/AuthenticationConfigurationPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.constraints.NotNull; public class AuthenticationConfigurationPersist { diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeFieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeFieldPersist.java index 3db61b247..8dfff57d4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeFieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeFieldPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 63a3c93c5..8cba296cc 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 @@ -3,7 +3,7 @@ package eu.eudat.model.persist.referencetypedefinition; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.ReferenceTypeSourceType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; 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 34753e333..07b5cb5bf 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 @@ -1,8 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; -import eu.eudat.commons.enums.ReferenceTypeSourceType; -import eu.eudat.commons.validation.ValidEnum; +import eu.eudat.commons.validation.old.ValidEnum; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull;