MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

DescriptionTemplateTypePersist remove old validators

This commit is contained in:
Efstratios Giannopoulos 2023-12-19 15:11:22 +02:00
parent 68c56d70a4
commit 4fa4cdc671
1 changed files with 19 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java
View File

@ -8,7 +8,6 @@ import eu.eudat.commons.validation.specification.Specification;
import eu.eudat.convention.ConventionService; import eu.eudat.convention.ConventionService;
import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.data.DescriptionTemplateTypeEntity;
import eu.eudat.errorcode.ErrorThesaurusProperties; import eu.eudat.errorcode.ErrorThesaurusProperties;
import eu.eudat.model.Description;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
@ -17,25 +16,16 @@ import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@FieldNotNullIfOtherSet(message = "{validation.hashempty}")
public class DescriptionTemplateTypePersist { public class DescriptionTemplateTypePersist {
@ValidId(message = "{validation.invalidid}")
private UUID id; private UUID id;
public final static String _id = "id"; public final static String _id = "id";
@NotNull(message = "{validation.empty}")
@NotEmpty(message = "{validation.empty}")
@Size(max = DescriptionTemplateTypeEntity._nameLength, message = "{validation.largerthanmax}")
private String name = null; private String name = null;
public final static String _name = "name"; public final static String _name = "name";
@ -44,16 +34,15 @@ public class DescriptionTemplateTypePersist {
public final static String _hash = "hash"; public final static String _hash = "hash";
@ValidEnum(message = "{validation.empty}")
private DescriptionTemplateTypeStatus status; private DescriptionTemplateTypeStatus status;
private List<DescriptionTemplateTypePersist> nested; // private List<DescriptionTemplateTypePersist> nested;
//
public final static String _nested = "nested"; // public final static String _nested = "nested";
//
private DescriptionTemplateTypePersist obj; // private DescriptionTemplateTypePersist obj;
//
public final static String _obj = "obj"; // public final static String _obj = "obj";
public UUID getId() { public UUID getId() {
return id; return id;
@ -87,34 +76,16 @@ public class DescriptionTemplateTypePersist {
this.status = status; this.status = status;
} }
public List<DescriptionTemplateTypePersist> getNested() {
return nested;
}
public void setNested(List<DescriptionTemplateTypePersist> nested) {
this.nested = nested;
}
public DescriptionTemplateTypePersist getObj() {
return obj;
}
public void setObj(DescriptionTemplateTypePersist obj) {
this.obj = obj;
}
@Component(DescriptionTemplateTypePersistValidator.ValidatorName) @Component(DescriptionTemplateTypePersistValidator.ValidatorName)
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public static class DescriptionTemplateTypePersistValidator extends BaseValidator<DescriptionTemplateTypePersist> { public static class DescriptionTemplateTypePersistValidator extends BaseValidator<DescriptionTemplateTypePersist> {
public static final String ValidatorName = "DescriptionTemplateTypePersistValidator"; public static final String ValidatorName = "DescriptionTemplateTypePersistValidator";
private final ValidatorFactory validatorFactory;
private final MessageSource messageSource; private final MessageSource messageSource;
public DescriptionTemplateTypePersistValidator(MessageSource messageSource, ValidatorFactory validatorFactory, ConventionService conventionService, ErrorThesaurusProperties errors) { public DescriptionTemplateTypePersistValidator(MessageSource messageSource, ConventionService conventionService, ErrorThesaurusProperties errors) {
super(conventionService, errors); super(conventionService, errors);
this.messageSource = messageSource; this.messageSource = messageSource;
this.validatorFactory = validatorFactory;
} }
@Override @Override
@ -139,17 +110,17 @@ public class DescriptionTemplateTypePersist {
this.spec() this.spec()
.iff(() -> !this.isEmpty(item.getName())) .iff(() -> !this.isEmpty(item.getName()))
.must(() -> this.lessEqual(item.getName(), DescriptionTemplateTypeEntity._nameLength)) .must(() -> this.lessEqual(item.getName(), DescriptionTemplateTypeEntity._nameLength))
.failOn(DescriptionTemplateTypePersist._name).failWith(messageSource.getMessage("Validation_MaxLength", new Object[]{DescriptionTemplateTypePersist._name}, LocaleContextHolder.getLocale())), .failOn(DescriptionTemplateTypePersist._name).failWith(messageSource.getMessage("Validation_MaxLength", new Object[]{DescriptionTemplateTypePersist._name}, LocaleContextHolder.getLocale()))
this.refSpec() // this.refSpec()
.iff(() -> item.getObj() != null) // .iff(() -> item.getObj() != null)
.on(DescriptionTemplateTypePersist._obj) // .on(DescriptionTemplateTypePersist._obj)
.over(item.getObj()) // .over(item.getObj())
.using(() -> this.validatorFactory.validator(DescriptionTemplateTypePersistValidator.class)), // .using(() -> this.validatorFactory.validator(DescriptionTemplateTypePersistValidator.class)),
this.navSpec() // this.navSpec()
.iff(() -> item.getNested() != null) // .iff(() -> item.getNested() != null)
.on(DescriptionTemplateTypePersist._nested) // .on(DescriptionTemplateTypePersist._nested)
.over(item.getNested()) // .over(item.getNested())
.using(() -> this.validatorFactory.validator(DescriptionTemplateTypePersistValidator.class)) // .using(() -> this.validatorFactory.validator(DescriptionTemplateTypePersistValidator.class))
); );
} }
} }