Merge pull request #261 from entando/ENG-3422_update

ENG-3422 Used new validate method
entando · Apr 21, 2022 · baafd0b · baafd0b
2 parents 37667cb + e44d473
commit baafd0b
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 11 deletions.
diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/CompositeAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/CompositeAttribute.java
@@ -30,6 +30,7 @@
 import com.agiletec.aps.system.services.lang.ILangManager;
 import org.entando.entando.ent.exception.EntException;
 import org.entando.entando.ent.exception.EntRuntimeException;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * This class describes the Entity of a Composed Attribute. This attribute is build by one or more elementary attributes
@@ -297,16 +298,22 @@ public Status getStatus() {
     }
 
     @Override
+    @Deprecated
     public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+        return this.validate(tracer, langManager, null);
+    }
+
+    @Override
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         try {
             List<AttributeInterface> attributes = this.getAttributes();
             for (int i = 0; i < attributes.size(); i++) {
                 AttributeInterface attributeElement = attributes.get(i);
                 AttributeTracer elementTracer = tracer.clone();
                 elementTracer.setCompositeElement(true);
                 elementTracer.setParentAttribute(this);
-                List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager);
+                List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager, beanFactory);
                 if (null != elementErrors) {
                     errors.addAll(elementErrors);
                 }

diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/DateAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/DateAttribute.java
@@ -32,6 +32,7 @@
 import com.agiletec.aps.system.common.entity.model.attribute.util.IAttributeValidationRules;
 import com.agiletec.aps.system.services.lang.ILangManager;
 import com.agiletec.aps.system.services.lang.Lang;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * This class describes the "Date" attribute; obviously it does not support
@@ -219,8 +220,14 @@ public Status getStatus() {
     }
 
     @Override
+    @Deprecated
     public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+        return this.validate(tracer, langManager, null);
+    }
+
+    @Override
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         if (null == this.getDate() && null != this.getFailedDateString()) {
             errors.add(new AttributeFieldError(this, FieldError.INVALID_FORMAT, tracer));
         }

diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/ListAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/ListAttribute.java
@@ -29,6 +29,7 @@
 import com.agiletec.aps.system.services.lang.ILangManager;
 import com.agiletec.aps.system.services.lang.Lang;
 import org.entando.entando.ent.exception.EntRuntimeException;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * This class represents the Attribute of type "Multi-language List", composed by several homogeneous attributes; there
@@ -209,8 +210,14 @@ public Status getStatus() {
     }
 
     @Override
+    @Deprecated
     public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+        return this.validate(tracer, langManager, null);
+    }
+
+    @Override
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         try {
             List<Lang> langs = langManager.getLangs();
             for (int i = 0; i < langs.size(); i++) {
@@ -226,7 +233,7 @@ public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager l
                     if (elementStatus.equals(Status.EMPTY)) {
                         errors.add(new AttributeFieldError(attributeElement, FieldError.INVALID, elementTracer));
                     } else {
-                        List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager);
+                        List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager, beanFactory);
                         if (null != elementErrors) {
                             errors.addAll(elementErrors);
                         }

diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/MonoListAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/MonoListAttribute.java
@@ -25,6 +25,7 @@
 import com.agiletec.aps.system.common.entity.model.FieldError;
 import com.agiletec.aps.system.services.lang.ILangManager;
 import org.entando.entando.ent.exception.EntRuntimeException;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * This class implements a list of homogeneous attributes.
@@ -183,8 +184,14 @@ public Status getStatus() {
     }
 
     @Override
+    @Deprecated
     public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+        return this.validate(tracer, langManager, null);
+    }
+
+    @Override
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         try {
             List<AttributeInterface> attributes = this.getAttributes();
             for (int i = 0; i < attributes.size(); i++) {
@@ -196,7 +203,7 @@ public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager l
                 if (elementStatus.equals(Status.EMPTY)) {
                     errors.add(new AttributeFieldError(attributeElement, FieldError.INVALID, elementTracer));
                 } else {
-                    List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager);
+                    List<AttributeFieldError> elementErrors = attributeElement.validate(elementTracer, langManager, beanFactory);
                     if (null != elementErrors) {
                         errors.addAll(elementErrors);
                     }

diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/NumberAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/NumberAttribute.java
@@ -30,6 +30,7 @@
 import com.agiletec.aps.system.common.entity.model.attribute.util.NumberAttributeValidationRules;
 import com.agiletec.aps.system.services.lang.ILangManager;
 import com.agiletec.aps.system.services.lang.Lang;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * This class describes a numeric information common for all the languages.
@@ -176,8 +177,14 @@ public Status getStatus() {
     }
 
     @Override
+    @Deprecated
     public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+        return this.validate(tracer, langManager, null);
+    }
+
+    @Override
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         if (null == this.getValue() && null != this.getFailedNumberString()) {
             errors.add(new AttributeFieldError(this, FieldError.INVALID_FORMAT, tracer));
         }

diff --git a/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/TimestampAttribute.java b/src/main/java/com/agiletec/aps/system/common/entity/model/attribute/TimestampAttribute.java
@@ -22,6 +22,7 @@
 import com.agiletec.aps.system.common.entity.model.AttributeTracer;
 import com.agiletec.aps.system.common.entity.model.FieldError;
 import com.agiletec.aps.system.services.lang.ILangManager;
+import org.springframework.beans.factory.BeanFactory;
 
 /**
  * @author E.Santoboni
@@ -38,10 +39,16 @@ public Element getJDOMElement() {
         }
         return attributeElement;
     }
-
+
+	@Override
+	@Deprecated
+	public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
+		return this.validate(tracer, langManager, null);
+	}
+
     @Override
-    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager) {
-        List<AttributeFieldError> errors = super.validate(tracer, langManager);
+    public List<AttributeFieldError> validate(AttributeTracer tracer, ILangManager langManager, BeanFactory beanFactory) {
+        List<AttributeFieldError> errors = super.validate(tracer, langManager, beanFactory);
         if (null == this.getDate() && 
 				(null != this.getFailedDateString() || null != this.getFailedHourString() || null != this.getFailedMinuteString() || null != this.getFailedSecondString())) {
             errors.add(new AttributeFieldError(this, FieldError.INVALID_FORMAT, tracer));