From 200948d962d44d04849061090c107e9e10c7996d Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Wed, 17 Jan 2024 11:20:02 +0200 Subject: [PATCH] update validator package --- dmp-backend/core/pom.xml | 2 +- .../commons/validation/AbstractValidator.java | 119 ------------------ .../commons/validation/BaseValidator.java | 2 + .../commons/validation/ValidationFailure.java | 24 ---- .../ValidationFilterAnnotation.java | 12 -- .../commons/validation/ValidationResult.java | 34 ----- .../eudat/commons/validation/Validator.java | 9 -- .../commons/validation/ValidatorFactory.java | 33 ----- .../NavigationDetailsSpecification.java | 16 --- ...NavigationDetailsSpecificationBuilder.java | 53 -------- .../NavigationReferenceSpecification.java | 15 --- ...vigationReferenceSpecificationBuilder.java | 53 -------- .../specification/PropertySpecification.java | 15 --- .../PropertySpecificationBuilder.java | 62 --------- .../specification/Specification.java | 6 - ...serTouchedIntegrationEventHandlerImpl.java | 2 - ...tificationIntegrationEventHandlerImpl.java | 3 +- .../RemoveCredentialRequest.java | 2 +- .../persist/ActionConfirmationPersist.java | 4 +- .../eudat/model/persist/CloneDmpPersist.java | 2 +- .../model/persist/ContactSupportPersist.java | 2 +- .../model/persist/DescriptionPersist.java | 4 +- .../persist/DescriptionProfilingRequest.java | 2 +- .../DescriptionProfilingWithDataRequest.java | 2 +- .../persist/DescriptionReferencePersist.java | 4 +- .../persist/DescriptionStatusPersist.java | 2 +- .../persist/DescriptionTemplatePersist.java | 4 +- .../DescriptionTemplateTypePersist.java | 2 +- .../model/persist/DmpBlueprintPersist.java | 5 +- .../DmpDescriptionTemplatePersist.java | 2 +- .../eu/eudat/model/persist/DmpPersist.java | 4 +- .../model/persist/DmpReferencePersist.java | 5 +- .../model/persist/DmpUserInvitePersist.java | 4 +- .../persist/DmpUserInviteTypePersist.java | 2 +- .../eudat/model/persist/DmpUserPersist.java | 2 +- .../model/persist/DmpUserRemovePersist.java | 2 +- .../eudat/model/persist/EntityDoiPersist.java | 2 +- .../eudat/model/persist/LanguagePersist.java | 2 +- .../eu/eudat/model/persist/LockPersist.java | 2 +- .../NewVersionDescriptionTemplatePersist.java | 4 +- .../model/persist/NewVersionDmpPersist.java | 2 +- .../persist/PublicContactSupportPersist.java | 2 +- .../eudat/model/persist/ReferencePersist.java | 4 +- .../model/persist/ReferenceTypePersist.java | 4 +- .../model/persist/StorageFilePersist.java | 2 +- .../persist/SupportiveMaterialPersist.java | 2 +- .../eu/eudat/model/persist/TagPersist.java | 2 +- .../eu/eudat/model/persist/TenantPersist.java | 4 +- .../persist/UserAdditionalInfoPersist.java | 2 +- .../UserDescriptionTemplatePersist.java | 2 +- .../persist/UserMergeRequestPersist.java | 3 +- .../eu/eudat/model/persist/UserPersist.java | 4 +- .../model/persist/UserRolePatchPersist.java | 2 +- .../model/persist/UserSettingsPersist.java | 2 +- .../DmpInvitationPersist.java | 2 +- .../MergeAccountConfirmationPersist.java | 2 +- .../RemoveCredentialRequestPersist.java | 2 +- .../deposit/DepositAuthenticateRequest.java | 2 +- .../model/persist/deposit/DepositRequest.java | 2 +- .../descriptionproperties/FieldPersist.java | 2 +- .../PropertyDefinitionPersist.java | 4 +- .../DefinitionPersist.java | 4 +- .../FieldPersist.java | 5 +- .../FieldSetPersist.java | 4 +- .../MultiplicityPersist.java | 2 +- .../PagePersist.java | 2 +- .../RulePersist.java | 2 +- .../SectionPersist.java | 6 +- .../AuthAutoCompleteDataPersist.java | 2 +- .../fielddata/AutoCompleteDataPersist.java | 4 +- .../AutoCompleteSingleDataPersist.java | 4 +- .../fielddata/BaseFieldDataPersist.java | 2 +- .../fielddata/ComboBoxOptionPersist.java | 2 +- .../fielddata/ExternalDatasetDataPersist.java | 2 +- .../LabelAndMultiplicityDataPersist.java | 2 +- .../fielddata/LabelDataPersist.java | 4 +- .../fielddata/RadioBoxDataPersist.java | 4 +- .../fielddata/RadioBoxOptionPersist.java | 2 +- .../fielddata/UploadDataPersist.java | 4 +- .../fielddata/UploadOptionPersist.java | 2 +- .../fielddata/WordListDataPersist.java | 4 +- .../DefinitionPersist.java | 6 +- .../DescriptionTemplatePersist.java | 2 +- .../ExtraFieldPersist.java | 2 +- .../dmpblueprintdefinition/FieldPersist.java | 2 +- .../SectionPersist.java | 4 +- .../SystemFieldPersist.java | 2 +- .../DmpBlueprintValuePersist.java | 2 +- .../dmpproperties/DmpContactPersist.java | 2 +- .../dmpproperties/DmpPropertiesPersist.java | 5 +- .../dmpreference/DmpReferenceDataPersist.java | 2 +- .../notification/NotificationPersist.java | 2 +- .../DefinitionPersist.java | 4 +- .../referencedefinition/FieldPersist.java | 2 +- .../AuthenticationConfigurationPersist.java | 2 +- .../DependencyPropertyPersist.java | 2 +- .../QueryConfigPersist.java | 2 +- .../ReferenceTypeDefinitionPersist.java | 6 +- .../ReferenceTypeFieldPersist.java | 2 +- ...nceTypeSourceBaseConfigurationPersist.java | 4 +- ...erenceTypeSourceBaseDependencyPersist.java | 4 +- ...SourceExternalApiConfigurationPersist.java | 4 +- ...ourceStaticOptionConfigurationPersist.java | 4 +- .../ReferenceTypeStaticOptionPersist.java | 2 +- ...sultFieldsMappingConfigurationPersist.java | 2 +- .../ResultsConfigurationPersist.java | 4 +- .../tenantconfig/TenantConfigPersist.java | 4 +- .../TenantDepositConfigPersist.java | 4 +- .../TenantFileTransformersConfigPersist.java | 4 +- .../tenantconfig/TenantSourcePersist.java | 2 +- .../validation/MyValidationService.java | 19 --- .../DescriptionTemplateServiceImpl.java | 3 +- .../eu/eudat/service/dmp/DmpServiceImpl.java | 2 +- .../dmpblueprint/DmpBlueprintServiceImpl.java | 2 +- .../AutoCompleteFieldDataHelperService.java | 14 +-- ...ExternalDatasetFieldDataHelperService.java | 6 +- .../FieldDataHelperService.java | 2 +- ...AndMultiplicityFieldDataHelperService.java | 6 +- .../LabelFieldDataHelperService.java | 6 +- .../RadioBoxFieldDataHelperService.java | 13 +- .../UploadFieldDataHelperService.java | 11 +- .../WordListFieldDataHelperService.java | 8 +- .../prefilling/PrefillingServiceImpl.java | 2 +- .../eudat/service/user/UserServiceImpl.java | 2 +- dmp-backend/pom.xml | 2 +- .../ValidatorRequestBodyAdvice.java | 6 +- .../v2/ContactSupportController.java | 17 +-- .../controllers/v2/DepositController.java | 2 +- .../controllers/v2/DescriptionController.java | 2 +- .../v2/DescriptionTemplateController.java | 3 +- .../v2/DescriptionTemplateTypeController.java | 2 +- .../v2/DmpBlueprintController.java | 2 +- .../eudat/controllers/v2/DmpController.java | 2 +- .../controllers/v2/EntityDoiController.java | 2 +- .../controllers/v2/LanguageController.java | 2 +- .../eudat/controllers/v2/LockController.java | 5 +- .../controllers/v2/PrefillingController.java | 2 +- .../controllers/v2/ReferenceController.java | 2 +- .../v2/ReferenceTypeController.java | 2 +- .../controllers/v2/StorageFileController.java | 26 +--- .../v2/SupportiveMaterialController.java | 2 +- .../eudat/controllers/v2/TagController.java | 2 +- .../controllers/v2/TenantController.java | 2 +- .../eudat/controllers/v2/UserController.java | 2 +- .../v2/UserSettingsController.java | 2 +- 145 files changed, 180 insertions(+), 736 deletions(-) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFailure.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFilterAnnotation.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationResult.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/Validator.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidatorFactory.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecification.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecificationBuilder.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecification.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecificationBuilder.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecification.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecificationBuilder.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/Specification.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/persist/validation/MyValidationService.java diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index f2486c905..331016e96 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -32,7 +32,7 @@ gr.cite validation - 2.1.0 + 3.0.0 gr.cite 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 deleted file mode 100644 index e2f3e81b1..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java +++ /dev/null @@ -1,119 +0,0 @@ -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()); - if (target instanceof Collection) { - ((Collection) target).forEach(x -> this.validate(x, this.bindingResult)); - } else { - 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 3a2e5ac9c..837c446b2 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 @@ -3,6 +3,8 @@ package eu.eudat.commons.validation; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyValidationException; +import gr.cite.tools.validation.AbstractValidator; +import gr.cite.tools.validation.ValidationResult; import org.apache.commons.validator.routines.EmailValidator; import java.util.*; diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFailure.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFailure.java deleted file mode 100644 index 9d20f56cb..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFailure.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.commons.validation; - -public class ValidationFailure { - public String errorKey; - - public String errorMessage; - - public ValidationFailure(String errorMessage) { - this.errorMessage = errorMessage; - } - - public ValidationFailure(String errorKey, String errorMessage) { - this.errorKey = errorKey; - this.errorMessage = errorMessage; - } - - public String getErrorKey() { - return errorKey; - } - - public String getErrorMessage() { - return errorMessage; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFilterAnnotation.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFilterAnnotation.java deleted file mode 100644 index e25ce8f5b..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFilterAnnotation.java +++ /dev/null @@ -1,12 +0,0 @@ -package eu.eudat.commons.validation; - -import java.lang.annotation.*; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -@Inherited -public @interface ValidationFilterAnnotation { - public String validator(); - public String argumentName(); - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationResult.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationResult.java deleted file mode 100644 index a659d175f..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationResult.java +++ /dev/null @@ -1,34 +0,0 @@ -package eu.eudat.commons.validation; - -import java.util.ArrayList; -import java.util.List; - -public class ValidationResult { - private final List errors; - - public ValidationResult() { - this.errors = new ArrayList<>(); - } - - public Boolean isValid() { - return this.errors.isEmpty(); - } - public ValidationResult add(ValidationFailure failure) { - if (failure != null) { - errors.add(failure); - } - return this; - } - - public ValidationResult addAll(List failures) { - if (failures != null) { - errors.addAll(failures); - } - return this; - } - - public List getErrors() { - return errors; - } -} - diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/Validator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/Validator.java deleted file mode 100644 index a3db41f5b..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/Validator.java +++ /dev/null @@ -1,9 +0,0 @@ -package eu.eudat.commons.validation; - -import org.springframework.validation.Errors; - -public interface Validator extends org.springframework.validation.Validator { - void validate(Object target); - void validateForce(Object target); - ValidationResult result(); -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidatorFactory.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidatorFactory.java deleted file mode 100644 index 9c3e844b7..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidatorFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package eu.eudat.commons.validation; - -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; - -@Service -public class ValidatorFactory { - - private final ApplicationContext applicationContext; - - public ValidatorFactory(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; - } - - public T validator(Class type){ - - T item = this.applicationContext.getBean(type); - - if (item == null || !(item instanceof Validator)) throw new RuntimeException("unrecognized validator " + type.getSimpleName()); - - return item; - } - - public Validator validator(String validtor){ - - Validator item = this.applicationContext.getBean(validtor, Validator.class); - - if (item == null || !(item instanceof Validator)) throw new RuntimeException("unrecognized validator " + validtor); - - return item; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecification.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecification.java deleted file mode 100644 index 9630799fb..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecification.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import eu.eudat.commons.validation.Validator; - -import java.util.List; -import java.util.function.Supplier; - -public interface NavigationDetailsSpecification extends Specification { - Supplier getPrecondition(); - - String getKey(); - - List getDetails(); - - Supplier getValidator(); -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecificationBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecificationBuilder.java deleted file mode 100644 index 1e9be5f18..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecificationBuilder.java +++ /dev/null @@ -1,53 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import eu.eudat.commons.validation.Validator; - -import java.util.List; -import java.util.function.Supplier; - -public class NavigationDetailsSpecificationBuilder implements NavigationDetailsSpecification { - private Supplier precondition; - private String key; - private List details; - private Supplier validator; - - public NavigationDetailsSpecificationBuilder iff(Supplier value){ - this.precondition = value; - return this; - } - - public NavigationDetailsSpecificationBuilder on(String value){ - this.key = value; - return this; - } - - public NavigationDetailsSpecificationBuilder over(List value){ - this.details = value; - return this; - } - - public NavigationDetailsSpecificationBuilder using(Supplier value){ - this.validator = value; - return this; - } - - @Override - public Supplier getPrecondition() { - return precondition; - } - - @Override - public String getKey() { - return key; - } - - @Override - public List getDetails() { - return details; - } - - @Override - public Supplier getValidator() { - return validator; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecification.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecification.java deleted file mode 100644 index 0ef62c71a..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecification.java +++ /dev/null @@ -1,15 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import eu.eudat.commons.validation.Validator; - -import java.util.function.Supplier; - -public interface NavigationReferenceSpecification extends Specification{ - Supplier getPrecondition(); - - String getKey(); - - Object getReference(); - - Supplier getValidator(); -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecificationBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecificationBuilder.java deleted file mode 100644 index 3f3465226..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecificationBuilder.java +++ /dev/null @@ -1,53 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import eu.eudat.commons.validation.Validator; - -import java.util.function.Supplier; - -public class NavigationReferenceSpecificationBuilder implements NavigationReferenceSpecification { - private Supplier precondition; - private String key; - private Object reference; - private Supplier validator; - - public NavigationReferenceSpecificationBuilder iff(Supplier value){ - this.precondition = value; - return this; - } - - public NavigationReferenceSpecificationBuilder on(String value){ - this.key = value; - return this; - } - - public NavigationReferenceSpecificationBuilder over(Object value){ - this.reference = value; - return this; - } - - public NavigationReferenceSpecificationBuilder using(Supplier value){ - this.validator = value; - return this; - } - - @Override - public Supplier getPrecondition() { - return precondition; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Object getReference() { - return reference; - } - - @Override - public Supplier getValidator() { - return validator; - } -} - diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecification.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecification.java deleted file mode 100644 index 12d317d68..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecification.java +++ /dev/null @@ -1,15 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import java.util.function.Supplier; - -public interface PropertySpecification extends Specification { - - Supplier getPrecondition(); - - Supplier getSpecification(); - - String getErrorKey(); - - String getErrorMessage(); - String getErrorCode(); -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecificationBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecificationBuilder.java deleted file mode 100644 index 9851d65c4..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecificationBuilder.java +++ /dev/null @@ -1,62 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import java.util.function.Supplier; - -public class PropertySpecificationBuilder implements PropertySpecification{ - private Supplier precondition; - private Supplier specification; - private String errorKey; - private String errorMessage; - private String errorCode = "validationerror"; - - public PropertySpecificationBuilder iff(Supplier value){ - this.precondition = value; - return this; - } - - public PropertySpecificationBuilder must(Supplier value){ - this.specification = value; - return this; - } - - public PropertySpecificationBuilder failOn(String value){ - this.errorKey = value; - return this; - } - - public PropertySpecificationBuilder failWith(String value){ - this.errorMessage = value; - return this; - } - - public PropertySpecificationBuilder failWithCode(String value){ - this.errorCode = value; - return this; - } - - @Override - public Supplier getPrecondition() { - return precondition; - } - - @Override - public Supplier getSpecification() { - return specification; - } - - @Override - public String getErrorKey() { - return errorKey; - } - - @Override - public String getErrorMessage() { - return errorMessage; - } - - @Override - public String getErrorCode() { - return errorCode; - } -} - diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/Specification.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/Specification.java deleted file mode 100644 index de64a65f1..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/Specification.java +++ /dev/null @@ -1,6 +0,0 @@ -package eu.eudat.commons.validation.specification; - -import java.util.function.Supplier; - -public interface Specification { -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java index 44bdd0e34..d3fc334cf 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java @@ -10,9 +10,7 @@ import eu.eudat.service.user.UserService; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.query.QueryFactory; -import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.logging.LoggerService; -import gr.cite.tools.validation.ValidationService; import jakarta.persistence.*; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/notification/NotificationIntegrationEventHandlerImpl.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/notification/NotificationIntegrationEventHandlerImpl.java index 62a3fe4d9..3bdde96a0 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/notification/NotificationIntegrationEventHandlerImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/notification/NotificationIntegrationEventHandlerImpl.java @@ -2,11 +2,9 @@ package eu.eudat.integrationevent.outbox.notification; import eu.eudat.audit.AuditableAction; import eu.eudat.commons.enums.ContactInfoType; -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.ValidatorFactory; import eu.eudat.data.UserContactInfoEntity; import eu.eudat.data.UserEntity; import eu.eudat.integrationevent.outbox.OutboxService; @@ -18,6 +16,7 @@ import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.logging.LoggerService; +import gr.cite.tools.validation.ValidatorFactory; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/actionconfirmation/RemoveCredentialRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/actionconfirmation/RemoveCredentialRequest.java index fbd630358..a3ab0d44d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/actionconfirmation/RemoveCredentialRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/actionconfirmation/RemoveCredentialRequest.java @@ -1,7 +1,7 @@ package eu.eudat.model.actionconfirmation; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 2c3a4c831..1acebac02 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 @@ -3,8 +3,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.ActionConfirmationStatus; import eu.eudat.commons.enums.ActionConfirmationType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.actionconfirmation.DmpInvitationPersist; 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 dcaeff347..2994eac69 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,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.apache.commons.compress.utils.Lists; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ContactSupportPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ContactSupportPersist.java index c16dcd226..b49b0d105 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ContactSupportPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ContactSupportPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 58319dfc4..b6234a76a 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 @@ -2,8 +2,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java index 2b8217c82..67b4f2714 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingRequest.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.fieldset.BaseFieldSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingWithDataRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingWithDataRequest.java index e070043d1..12a6d1972 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingWithDataRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionProfilingWithDataRequest.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.fieldset.BaseFieldSet; 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 147dc37ef..65495d31f 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,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 3bb7ea013..4e469db12 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 bb9329c20..f4612aaf4 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,8 +2,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 c51fa2c43..ec68a88e7 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java @@ -4,7 +4,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateTypeStatus; import eu.eudat.commons.validation.*; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 a1419c50e..80e7c37b1 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 @@ -2,12 +2,11 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpBlueprintStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DmpBlueprintEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; -import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist; import eu.eudat.model.persist.dmpblueprintdefinition.DefinitionPersist; import jakarta.validation.constraints.Size; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 22176440f..42b1c49b1 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 51cbe2720..b90ebbed3 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 @@ -3,8 +3,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpAccessType; import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DmpEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 353a063df..f3d2e8088 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,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.dmpreference.DmpReferenceDataPersist; @@ -14,7 +14,6 @@ import org.springframework.stereotype.Component; import java.util.Arrays; import java.util.List; -import java.util.UUID; public class DmpReferencePersist { 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 bc5a1b341..9dd07a3e3 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 @@ -2,8 +2,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpUserRole; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 1cabaa3fc..016a67db2 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,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserPersist.java index d274afe75..92695e6b9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpUserPersist.java @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpUserRole; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 0832dac56..93375e9ae 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DmpUserRole; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 8feea9eb5..315dd4666 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.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 86da94b5d..3aed8a704 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,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.LanguageEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 e8feedad0..8d83705f7 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.LockTargetType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 d7a4c8b26..2e056d6ef 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,8 +2,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.DescriptionTemplateStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 cc0bef95d..c704c5ec7 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.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.DmpEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/PublicContactSupportPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/PublicContactSupportPersist.java index 5faf61fb4..ab09e7b3d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/PublicContactSupportPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/PublicContactSupportPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 95feb91e6..f4cb7d973 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 @@ -3,8 +3,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.ReferenceSourceType; import eu.eudat.commons.enums.ReferenceType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.ReferenceEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 c1d7d6dec..bfa1c9d59 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,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.ReferenceTypeEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 197e63e58..755b712da 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.StorageType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.StorageFileEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 4feb5c54d..097c8d01f 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.SupportiveMaterialFieldType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.SupportiveMaterialEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/TagPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/TagPersist.java index 7ab51e0f2..48aa35596 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/TagPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/TagPersist.java @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.TagEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 1ded6cb1a..7d411ce30 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,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.TenantEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 0c8dd925b..8f4368352 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,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 2a93cebb1..9cc9b8d22 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.UserDescriptionTemplateRole; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserMergeRequestPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserMergeRequestPersist.java index 41bac0869..0879437f2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserMergeRequestPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserMergeRequestPersist.java @@ -1,8 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 b5c08b251..04ce3b090 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,8 +1,8 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.data.UserEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; 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 88b4be4d6..27e51a081 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,7 +1,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 15334623a..5244b3105 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist; import eu.eudat.commons.enums.UserSettingsType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 ae03465f3..1e54a7bc4 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist.actionconfirmation; import eu.eudat.commons.enums.DmpUserRole; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/MergeAccountConfirmationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/MergeAccountConfirmationPersist.java index 768253c8f..88fcf0cdb 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/MergeAccountConfirmationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/MergeAccountConfirmationPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.actionconfirmation; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/RemoveCredentialRequestPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/RemoveCredentialRequestPersist.java index ba4dbb4af..f3498dfbc 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/RemoveCredentialRequestPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/actionconfirmation/RemoveCredentialRequestPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.actionconfirmation; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositAuthenticateRequest.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositAuthenticateRequest.java index 0d160c832..9df371675 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositAuthenticateRequest.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/deposit/DepositAuthenticateRequest.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.deposit; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.ReferencePersist; 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 b00bdeba8..fe8f79fbc 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,7 +1,7 @@ package eu.eudat.model.persist.deposit; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import gr.cite.tools.fieldset.BaseFieldSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java index 6cc55c753..098ad3b21 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptionproperties; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.context.MessageSource; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java index 8dcf6846e..1d2ea19c5 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/PropertyDefinitionPersist.java @@ -2,11 +2,11 @@ package eu.eudat.model.persist.descriptionproperties; import eu.eudat.commons.enums.DescriptionStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.validation.StatusAware; +import gr.cite.tools.validation.ValidatorFactory; +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; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java index d9896f9c7..a401f910a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java index fc5ea1712..610651d72 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java @@ -1,10 +1,9 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; -import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.enums.FieldValidationType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java index fedd67717..248e03f94 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java index ac6b63ca3..435259d7e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.apache.commons.compress.utils.Lists; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java index 802395039..8873f663b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java index a9738f83c..c454eca86 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java index 9fae38779..041860e09 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java @@ -1,12 +1,10 @@ package eu.eudat.model.persist.descriptiontemplatedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; -import eu.eudat.model.persist.ActionConfirmationPersist; -import eu.eudat.model.persist.actionconfirmation.DmpInvitationPersist; 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/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java index 3185f4d68..4eb40e0cb 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.context.MessageSource; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java index 4c5e1a065..1e494ca56 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 3671b83c5..d019fb7f4 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 @@ -2,8 +2,8 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 07fff1d0d..3aac4c0f1 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 @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.context.MessageSource; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java index 113e4b04b..82c16ff90 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 001686c1d..1428e65b1 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 @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.enums.FieldDataExternalDatasetType; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java index 079084859..de46f25dc 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java @@ -1,6 +1,6 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java index 7da07e9aa..8b6d453b0 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java index 73de32e27..951ea14dc 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java index fc70ea54d..367e94a3e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java index 031bb5b23..8d9ad4b61 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java index 40cea46a5..fffe28979 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java index 235b08789..a021ddff0 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java index cd45e072d..137d3db5b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DefinitionPersist.java @@ -1,12 +1,10 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; 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/dmpblueprintdefinition/DescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/DescriptionTemplatePersist.java index bcba64ae9..62e754a1e 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,7 +1,7 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.descriptiontemplatedefinition.FieldPersist; 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 f581af7aa..cd9aecef0 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.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 0a07bc388..1005801e2 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 @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.DmpBlueprintFieldCategory; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.context.MessageSource; 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 8fbb15838..a042c1fdc 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 @@ -2,8 +2,8 @@ package eu.eudat.model.persist.dmpblueprintdefinition; import eu.eudat.commons.enums.DmpBlueprintFieldCategory; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 d6f939ffa..68efc88f3 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.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpBlueprintValuePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpBlueprintValuePersist.java index 91a8fa072..89b8e043d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpBlueprintValuePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpBlueprintValuePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpproperties; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.ReferencePersist; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpContactPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpContactPersist.java index 39f137e0b..69c573fd1 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpContactPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpContactPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpproperties; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java index 63a8dbb8b..38e7e2002 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpproperties/DmpPropertiesPersist.java @@ -2,11 +2,10 @@ package eu.eudat.model.persist.dmpproperties; import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; -import eu.eudat.model.persist.DmpPersist; import eu.eudat.model.persist.validation.StatusAware; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpreference/DmpReferenceDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpreference/DmpReferenceDataPersist.java index 12353ba8b..dd709256b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpreference/DmpReferenceDataPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpreference/DmpReferenceDataPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.dmpreference; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.ReferencePersist; 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 96a8a061f..4876d932c 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 @@ -5,7 +5,7 @@ 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.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java index e5a48e32a..0fed037d2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencedefinition/DefinitionPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.referencedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import jakarta.validation.Valid; 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 b3acd1fd9..95ceaaefc 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 @@ -3,7 +3,7 @@ package eu.eudat.model.persist.referencedefinition; import eu.eudat.commons.enums.ReferenceFieldDataType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 4b06608d5..dbf6a9394 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/DependencyPropertyPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/DependencyPropertyPersist.java index c0b97c40c..694958760 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/DependencyPropertyPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/DependencyPropertyPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/QueryConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/QueryConfigPersist.java index e2aac28fc..9822bc75a 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/QueryConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/QueryConfigPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import jakarta.xml.bind.annotation.XmlElement; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java index 18a53a72c..5fbb67e05 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeDefinitionPersist.java @@ -2,12 +2,10 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceTypeSourceType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; -import eu.eudat.model.persist.DescriptionPersist; -import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist; 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/referencetypedefinition/ReferenceTypeFieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeFieldPersist.java index f3fe6cef0..11413b72d 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 @@ -2,7 +2,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceFieldDataType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.model.persist.DescriptionPersist; 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 1b6e7a131..c23d09769 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 @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import eu.eudat.commons.enums.ReferenceTypeSourceType; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java index 98958cfa0..95738ea92 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceBaseDependencyPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; 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 3e95ad189..8734cb2e8 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,10 +1,10 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.enums.ReferenceTypeExternalApiHTTPMethodType; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; +import gr.cite.tools.validation.ValidatorFactory; +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; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java index 962d7be06..589bfafdd 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeSourceStaticOptionConfigurationPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeStaticOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeStaticOptionPersist.java index 0c3a02ebb..50dc6a851 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeStaticOptionPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ReferenceTypeStaticOptionPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultFieldsMappingConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultFieldsMappingConfigurationPersist.java index 95978ec77..12c15818c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultFieldsMappingConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultFieldsMappingConfigurationPersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java index 5dd0229fe..fb75a191e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/referencetypedefinition/ResultsConfigurationPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.referencetypedefinition; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantConfigPersist.java index 7456bf899..212f53497 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantConfigPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.tenantconfig; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java index e2bbd6ea0..992397775 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.tenantconfig; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java index b8ede05c5..19751a798 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java @@ -1,8 +1,8 @@ package eu.eudat.model.persist.tenantconfig; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.ValidatorFactory; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java index 46add9237..9433fc09e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java @@ -1,7 +1,7 @@ package eu.eudat.model.persist.tenantconfig; import eu.eudat.commons.validation.BaseValidator; -import eu.eudat.commons.validation.specification.Specification; +import gr.cite.tools.validation.specification.Specification; import eu.eudat.convention.ConventionService; import eu.eudat.errorcode.ErrorThesaurusProperties; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/validation/MyValidationService.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/validation/MyValidationService.java deleted file mode 100644 index 859361697..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/validation/MyValidationService.java +++ /dev/null @@ -1,19 +0,0 @@ -package eu.eudat.model.persist.validation; - -import gr.cite.tools.validation.BaseValidationService; -import jakarta.validation.Validator; -import org.springframework.stereotype.Component; - -@Component -public class MyValidationService extends BaseValidationService { - - public MyValidationService(Validator validator) { - super(validator); - } - - @Override - public void validateForce(T item, Class... groups) { - - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java index 570605017..d4905b824 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java @@ -13,7 +13,6 @@ import eu.eudat.commons.types.descriptiontemplate.*; import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.*; import eu.eudat.commons.types.notification.*; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.configurations.notification.NotificationProperties; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateEntity; @@ -56,7 +55,7 @@ import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; -import gr.cite.tools.validation.ValidationService; +import gr.cite.tools.validation.ValidatorFactory; import jakarta.persistence.EntityManager; import jakarta.xml.bind.JAXBException; import org.jetbrains.annotations.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java index 39c89957a..b8a474150 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java @@ -16,7 +16,6 @@ import eu.eudat.commons.types.dmpreference.DmpReferenceDataEntity; import eu.eudat.commons.types.notification.*; import eu.eudat.commons.types.reference.DefinitionEntity; import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.configurations.notification.NotificationProperties; import eu.eudat.convention.ConventionService; import eu.eudat.data.*; @@ -58,6 +57,7 @@ import gr.cite.tools.exception.MyValidationException; import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; +import gr.cite.tools.validation.ValidatorFactory; import jakarta.persistence.EntityManager; import jakarta.xml.bind.JAXBException; import org.jetbrains.annotations.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java index 23da2dad3..948b30d73 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java @@ -10,7 +10,6 @@ import eu.eudat.commons.enums.DmpBlueprintSystemFieldType; import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.types.dmpblueprint.*; import eu.eudat.commons.types.dmpblueprint.importexport.*; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.data.DmpBlueprintEntity; import eu.eudat.errorcode.ErrorThesaurusProperties; @@ -37,6 +36,7 @@ import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; +import gr.cite.tools.validation.ValidatorFactory; import jakarta.persistence.EntityManager; import jakarta.xml.bind.JAXBException; import org.jetbrains.annotations.NotNull; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java index cde2f6bc4..da383b7b4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java @@ -1,29 +1,19 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; -import eu.eudat.commons.types.descriptiontemplate.SectionEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.*; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.AutoCompleteDataBuilder; -import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData; import eu.eudat.model.descriptiontemplatedefinition.fielddata.AutoCompleteData; -import eu.eudat.model.persist.descriptiontemplatedefinition.FieldSetPersist; -import eu.eudat.model.persist.descriptiontemplatedefinition.PagePersist; -import eu.eudat.model.persist.descriptiontemplatedefinition.SectionPersist; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import org.w3c.dom.Element; import java.util.ArrayList; import java.util.EnumSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java index c5c4272ad..45a0d91c8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java @@ -1,17 +1,15 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.types.descriptiontemplate.fielddata.ExternalDatasetDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ExternalDatasetDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ExternalDatasetDataBuilder; import eu.eudat.model.descriptiontemplatedefinition.fielddata.ExternalDatasetData; -import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.AutoCompleteDataPersist; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.springframework.stereotype.Component; import java.util.EnumSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java index 724df766f..96241ef12 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java @@ -4,10 +4,10 @@ import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport; -import eu.eudat.commons.validation.Validator; import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; import java.util.EnumSet; import java.util.List; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java index 34b3a133b..db692d4ed 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java @@ -1,17 +1,15 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.LabelAndMultiplicityDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityDataBuilder; import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityData; -import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityDataPersist; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.springframework.stereotype.Component; import java.util.EnumSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java index 3afde0c6f..55426b4a1 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java @@ -1,17 +1,15 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.LabelDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LabelDataBuilder; import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelData; -import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LabelDataPersist; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.springframework.stereotype.Component; import java.util.EnumSet; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java index e95947dcc..c325a865f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java @@ -1,27 +1,18 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; -import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxDataImportExport; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxOption; -import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataOption; -import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RadioBoxDataBuilder; -import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData; import eu.eudat.model.descriptiontemplatedefinition.fielddata.RadioBoxData; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java index e9c6f029a..9186338b6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java @@ -1,25 +1,18 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; -import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataImportExport; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataOption; -import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.UploadDataBuilder; -import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData; import eu.eudat.model.descriptiontemplatedefinition.fielddata.UploadData; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java index 584857db0..f368f67e6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java @@ -1,23 +1,19 @@ package eu.eudat.service.fielddatahelper; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.FieldType; import eu.eudat.commons.types.descriptiontemplate.fielddata.*; import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ComboBoxDataOptionEntity; import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.WordListDataBuilder; -import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData; import eu.eudat.model.descriptiontemplatedefinition.fielddata.WordListData; import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java index 0a75a15b0..5a5079c37 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java @@ -12,7 +12,6 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity; import eu.eudat.commons.types.prefilling.PrefillingEntity; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.data.ReferenceEntity; @@ -43,6 +42,7 @@ import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; +import gr.cite.tools.validation.ValidatorFactory; import jakarta.persistence.EntityManager; import jakarta.xml.bind.JAXBException; import org.json.JSONObject; diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/user/UserServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/user/UserServiceImpl.java index 8535f2b93..103d4ff9f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/user/UserServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/user/UserServiceImpl.java @@ -17,7 +17,6 @@ import eu.eudat.commons.types.actionconfirmation.RemoveCredentialRequestEntity; import eu.eudat.commons.types.notification.*; import eu.eudat.commons.types.user.AdditionalInfoEntity; import eu.eudat.commons.types.usercredential.UserCredentialDataEntity; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.configurations.notification.NotificationProperties; import eu.eudat.convention.ConventionService; import eu.eudat.data.*; @@ -52,6 +51,7 @@ import gr.cite.tools.fieldset.BaseFieldSet; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; +import gr.cite.tools.validation.ValidatorFactory; import jakarta.persistence.EntityManager; import jakarta.xml.bind.JAXBException; import org.apache.commons.csv.CSVFormat; diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index 8660d01cb..62751f2d5 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -330,7 +330,7 @@ gr.cite validation - 2.1.0 + 3.0.0 gr.cite diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ValidatorRequestBodyAdvice.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ValidatorRequestBodyAdvice.java index 703127b3d..b22398f06 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ValidatorRequestBodyAdvice.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ValidatorRequestBodyAdvice.java @@ -1,9 +1,9 @@ package eu.eudat.controllers.controllerhandler; -import eu.eudat.commons.validation.Validator; -import eu.eudat.commons.validation.ValidatorFactory; -import eu.eudat.commons.validation.ValidationFilterAnnotation; import gr.cite.tools.exception.MyApplicationException; +import gr.cite.tools.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.Validator; +import gr.cite.tools.validation.ValidatorFactory; import org.jetbrains.annotations.NotNull; import org.springframework.core.MethodParameter; import org.springframework.http.HttpInputMessage; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ContactSupportController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ContactSupportController.java index eb0070a03..e817c49a9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ContactSupportController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ContactSupportController.java @@ -1,27 +1,13 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; -import eu.eudat.commons.scope.user.UserScope; -import eu.eudat.commons.validation.ValidationFilterAnnotation; -import eu.eudat.model.DashboardStatistics; -import eu.eudat.model.RecentActivityItem; -import eu.eudat.model.RecentActivityItemLookup; -import eu.eudat.model.User; -import eu.eudat.model.censorship.MyDashboardStatisticsCensor; -import eu.eudat.model.censorship.PublicDashboardStatisticsCensor; -import eu.eudat.model.censorship.RecentActivityItemCensor; import eu.eudat.model.persist.ContactSupportPersist; -import eu.eudat.model.persist.DescriptionTemplateTypePersist; import eu.eudat.model.persist.PublicContactSupportPersist; import eu.eudat.service.contactsupport.ContactSupportService; -import eu.eudat.service.dashborad.DashboardService; import gr.cite.tools.auditing.AuditService; -import gr.cite.tools.data.censor.CensorFactory; -import gr.cite.tools.exception.MyApplicationException; -import gr.cite.tools.exception.MyForbiddenException; -import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; +import gr.cite.tools.validation.ValidationFilterAnnotation; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.management.InvalidApplicationException; import java.util.AbstractMap; -import java.util.List; import java.util.Map; @RestController diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DepositController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DepositController.java index 1f8e6000d..e14926c55 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DepositController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DepositController.java @@ -1,7 +1,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.controllers.BaseController; import eu.eudat.logic.services.ApiContext; import eu.eudat.model.EntityDoi; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionController.java index 5a491e8a8..2bb2e4309 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionController.java @@ -6,7 +6,7 @@ import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.commons.enums.DmpAccessType; import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.model.Description; import eu.eudat.model.Dmp; import eu.eudat.model.PublicDescription; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java index 5ed8c5326..c01f89863 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.DescriptionTemplateEntity; import eu.eudat.model.DescriptionTemplate; import eu.eudat.model.DmpBlueprint; @@ -26,7 +26,6 @@ import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; -import gr.cite.tools.validation.MyValidate; import jakarta.xml.bind.JAXBException; import org.slf4j.LoggerFactory; import org.springframework.context.MessageSource; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateTypeController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateTypeController.java index 527ee66a5..9477aa2fc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateTypeController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateTypeController.java @@ -3,7 +3,6 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.data.DescriptionTemplateTypeEntity; -import eu.eudat.commons.validation.ValidationFilterAnnotation; import eu.eudat.logic.services.ApiContext; import eu.eudat.model.DescriptionTemplateType; import eu.eudat.model.builder.DescriptionTemplateTypeBuilder; @@ -23,6 +22,7 @@ import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; +import gr.cite.tools.validation.ValidationFilterAnnotation; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java index 43182610f..3f3891810 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.DmpBlueprintEntity; import eu.eudat.model.DmpBlueprint; import eu.eudat.model.builder.DmpBlueprintBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java index 138315c5b..9a6d476b5 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.DmpEntity; import eu.eudat.model.*; import eu.eudat.model.builder.DmpBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/EntityDoiController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/EntityDoiController.java index 1de7e164a..31d0e87cd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/EntityDoiController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/EntityDoiController.java @@ -2,7 +2,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.EntityDoiEntity; import eu.eudat.model.DescriptionTemplateType; import eu.eudat.model.EntityDoi; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java index e087cf1df..d7223edf5 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.LanguageEntity; import eu.eudat.model.Language; import eu.eudat.model.UserContactInfo; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LockController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LockController.java index 69a66b93f..68b8c68e0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LockController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LockController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.authorization.Permission; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.LockEntity; import eu.eudat.model.Lock; import eu.eudat.model.builder.LockBuilder; @@ -24,7 +24,6 @@ import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; -import gr.cite.tools.validation.MyValidate; import jakarta.transaction.Transactional; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -118,7 +117,7 @@ public class LockController { @PostMapping("persist") @Transactional @ValidationFilterAnnotation(validator = LockPersist.LockPersistValidator.ValidatorName, argumentName = "model") - public Lock persist(@MyValidate @RequestBody LockPersist model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, InvalidApplicationException { + public Lock persist(@RequestBody LockPersist model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, InvalidApplicationException { logger.debug(new MapLogEntry("persisting" + Lock.class.getSimpleName()).And("model", model).And("fieldSet", fieldSet)); this.censorFactory.censor(LockCensor.class).censor(fieldSet, null); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/PrefillingController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/PrefillingController.java index b89f9d81a..1505f8674 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/PrefillingController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/PrefillingController.java @@ -1,7 +1,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.model.Description; import eu.eudat.model.Prefilling; import eu.eudat.model.PrefillingLookup; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java index ab0059fdf..93646f972 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.authorization.Permission; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.controllers.BaseController; import eu.eudat.data.ReferenceEntity; import eu.eudat.commons.exceptions.HugeResultSetException; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceTypeController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceTypeController.java index ebd7e322a..7103e7c7b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceTypeController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceTypeController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.controllers.BaseController; import eu.eudat.data.ReferenceTypeEntity; import eu.eudat.logic.services.ApiContext; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/StorageFileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/StorageFileController.java index 0ac4ff908..f629a40f6 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/StorageFileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/StorageFileController.java @@ -1,48 +1,31 @@ package eu.eudat.controllers.v2; -import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; -import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.authorization.Permission; -import eu.eudat.commons.enums.*; +import eu.eudat.commons.enums.StorageType; import eu.eudat.commons.scope.user.UserScope; -import eu.eudat.commons.validation.ValidatorFactory; import eu.eudat.convention.ConventionService; import eu.eudat.data.StorageFileEntity; -import eu.eudat.model.*; -import eu.eudat.model.builder.DescriptionBuilder; -import eu.eudat.model.censorship.DescriptionCensor; -import eu.eudat.model.censorship.PublicDescriptionCensor; -import eu.eudat.model.persist.DescriptionPersist; +import eu.eudat.model.StorageFile; import eu.eudat.model.persist.StorageFilePersist; -import eu.eudat.model.result.QueryResult; -import eu.eudat.query.DescriptionQuery; -import eu.eudat.query.DmpQuery; import eu.eudat.query.StorageFileQuery; -import eu.eudat.query.lookup.DescriptionLookup; -import eu.eudat.service.description.DescriptionService; -import eu.eudat.service.elastic.ElasticQueryHelperService; import eu.eudat.service.storage.StorageFileProperties; import eu.eudat.service.storage.StorageFileService; import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.tools.auditing.AuditService; -import gr.cite.tools.data.builder.BuilderFactory; -import gr.cite.tools.data.censor.CensorFactory; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyForbiddenException; import gr.cite.tools.exception.MyNotFoundException; import gr.cite.tools.fieldset.BaseFieldSet; -import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; -import gr.cite.tools.validation.MyValidate; +import gr.cite.tools.validation.ValidatorFactory; import org.apache.commons.io.FilenameUtils; import org.slf4j.LoggerFactory; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.io.ByteArrayResource; -import org.springframework.core.io.InputStreamResource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -50,14 +33,11 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.management.InvalidApplicationException; import java.io.IOException; import java.net.URLConnection; import java.time.Duration; import java.util.*; -import static eu.eudat.authorization.AuthorizationFlags.Public; - @RestController @RequestMapping(path = "api/storage-file") public class StorageFileController { diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java index edf5e57a1..266fe8985 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.SupportiveMaterialEntity; import eu.eudat.model.SupportiveMaterial; import eu.eudat.model.builder.SupportiveMaterialBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TagController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TagController.java index 1feec7d88..543b0e66c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TagController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TagController.java @@ -2,7 +2,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.TagEntity; import eu.eudat.logic.services.ApiContext; import eu.eudat.model.Tag; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TenantController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TenantController.java index 72ab40eb6..83f0b9456 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TenantController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/TenantController.java @@ -3,7 +3,7 @@ package eu.eudat.controllers.v2; import com.fasterxml.jackson.core.JsonProcessingException; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.TenantEntity; import eu.eudat.model.Tenant; import eu.eudat.model.builder.TenantBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserController.java index 9b4f976e3..1ab597f1a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserController.java @@ -5,7 +5,7 @@ import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.scope.user.UserScope; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.UserEntity; import eu.eudat.model.DmpAssociatedUser; import eu.eudat.model.User; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserSettingsController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserSettingsController.java index 74e03a893..e674d3f81 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserSettingsController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/UserSettingsController.java @@ -2,7 +2,7 @@ package eu.eudat.controllers.v2; import eu.eudat.audit.AuditableAction; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.validation.ValidationFilterAnnotation; +import gr.cite.tools.validation.ValidationFilterAnnotation; import eu.eudat.data.UserSettingsEntity; import eu.eudat.model.UserSettings; import eu.eudat.model.builder.UserSettingsBuilder;