update validator package

dmp-backend/core/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>gr.cite</groupId>
             <artifactId>validation</artifactId>
-            <version>2.1.0</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>gr.cite</groupId>

dmp-backend/core/src/main/java/eu/eudat/commons/validation/AbstractValidator.java

@@ -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<T> implements Validator {
-	private BeanPropertyBindingResult bindingResult;
-
-	protected abstract Class<T> modelClass();
-	
-	protected abstract List<Specification> 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<Specification> specifications = this.specifications(item);
-		if (specifications == null) return;;
-		List<PropertySpecification> 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<NavigationReferenceSpecification> 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<NavigationDetailsSpecification> 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<Map.Entry<String, List<String>>> flattenValidationResult() {
-		ValidationResult result = result();
-		List<Map.Entry<String, List<String>>> errorsMap = new ArrayList<>();
-		for (ValidationFailure fieldError : result.getErrors()){
-			Map.Entry<String, List<String>> 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();
-	}
-}
-

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.*;

dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFailure.java

@@ -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;
-	}
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationFilterAnnotation.java

@@ -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();
-
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidationResult.java

@@ -1,34 +0,0 @@
-package eu.eudat.commons.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ValidationResult {
-	private final List<ValidationFailure> 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<ValidationFailure> failures) {
-		if (failures != null) {
-			errors.addAll(failures);
-		}
-		return this;
-	}
-
-	public List<ValidationFailure> getErrors() {
-		return errors;
-	}
-}
-

dmp-backend/core/src/main/java/eu/eudat/commons/validation/Validator.java

@@ -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();
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/ValidatorFactory.java

@@ -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 extends Validator> T validator(Class<T> 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;
-	}
-
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecification.java

@@ -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<Boolean> getPrecondition();
-
-	String getKey();
-
-	List<?> getDetails();
-
-	Supplier<Validator> getValidator();
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationDetailsSpecificationBuilder.java

@@ -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<Boolean> precondition;
-	private String key;
-	private List<?> details;
-	private Supplier<Validator> validator;
-
-	public NavigationDetailsSpecificationBuilder iff(Supplier<Boolean> 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<Validator> value){
-		this.validator = value;
-		return this;
-	}
-
-	@Override
-	public Supplier<Boolean> getPrecondition() {
-		return precondition;
-	}
-
-	@Override
-	public String getKey() {
-		return key;
-	}
-
-	@Override
-	public List<?> getDetails() {
-		return details;
-	}
-
-	@Override
-	public Supplier<Validator> getValidator() {
-		return validator;
-	}
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecification.java

@@ -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<Boolean> getPrecondition();
-
-	String getKey();
-
-	Object getReference();
-
-	Supplier<Validator> getValidator();
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/NavigationReferenceSpecificationBuilder.java

@@ -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<Boolean> precondition;
-	private String key;
-	private Object reference;
-	private Supplier<Validator> validator;
-	
-	public NavigationReferenceSpecificationBuilder iff(Supplier<Boolean> 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<Validator> value){
-		this.validator = value;
-		return this;
-	}
-
-	@Override
-	public Supplier<Boolean> getPrecondition() {
-		return precondition;
-	}
-
-	@Override
-	public String getKey() {
-		return key;
-	}
-
-	@Override
-	public Object getReference() {
-		return reference;
-	}
-
-	@Override
-	public Supplier<Validator> getValidator() {
-		return validator;
-	}
-}
-

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecification.java

@@ -1,15 +0,0 @@
-package eu.eudat.commons.validation.specification;
-
-import java.util.function.Supplier;
-
-public interface PropertySpecification extends Specification {
-
-	Supplier<Boolean> getPrecondition();
-
-	Supplier<Boolean> getSpecification();
-
-	String getErrorKey();
-
-	String getErrorMessage();
-	String getErrorCode();
-}

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/PropertySpecificationBuilder.java

@@ -1,62 +0,0 @@
-package eu.eudat.commons.validation.specification;
-
-import java.util.function.Supplier;
-
-public class PropertySpecificationBuilder implements PropertySpecification{
-	private Supplier<Boolean> precondition;
-	private Supplier<Boolean> specification;
-	private String errorKey;
-	private String errorMessage;
-	private String errorCode = "validationerror";
-	
-	public PropertySpecificationBuilder iff(Supplier<Boolean> value){
-		this.precondition = value;
-		return this;
-	}
-
-	public PropertySpecificationBuilder must(Supplier<Boolean> 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<Boolean> getPrecondition() {
-		return precondition;
-	}
-
-	@Override
-	public Supplier<Boolean> getSpecification() {
-		return specification;
-	}
-
-	@Override
-	public String getErrorKey() {
-		return errorKey;
-	}
-
-	@Override
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	@Override
-	public String getErrorCode() {
-		return errorCode;
-	}
-}
-

dmp-backend/core/src/main/java/eu/eudat/commons/validation/specification/Specification.java

@@ -1,6 +0,0 @@
-package eu.eudat.commons.validation.specification;
-
-import java.util.function.Supplier;
-
-public interface Specification {
-}

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;

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;

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;

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 gr.cite.tools.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 eu.eudat.model.persist.actionconfirmation.DmpInvitationPersist;

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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.DescriptionEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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;

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 gr.cite.tools.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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-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;

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 gr.cite.tools.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 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 {
 

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 gr.cite.tools.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;

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;

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;

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;

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;

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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.ReferenceEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.ReferenceTypeEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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;

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;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.TenantEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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;

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 gr.cite.tools.validation.specification.Specification;
-import eu.eudat.commons.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.errorcode.ErrorThesaurusProperties;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

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 gr.cite.tools.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
+import gr.cite.tools.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.UserEntity;
 import eu.eudat.errorcode.ErrorThesaurusProperties;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 gr.cite.tools.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;

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 gr.cite.tools.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 eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*;

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 gr.cite.tools.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;

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;

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;

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;

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 gr.cite.tools.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 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;

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;

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 gr.cite.tools.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;

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 gr.cite.tools.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;

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;

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;

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;

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;

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 gr.cite.tools.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;

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 gr.cite.tools.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;

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;

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 gr.cite.tools.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;

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;

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 gr.cite.tools.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;

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 gr.cite.tools.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 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;

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;

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;

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;

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 gr.cite.tools.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;

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;

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;

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;

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 gr.cite.tools.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 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;

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;

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;

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 gr.cite.tools.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 jakarta.validation.Valid;

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;

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;

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;

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;

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 gr.cite.tools.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 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;

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;

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;