优化类名

hsweb-web-bean/src/main/java/org/hsweb/web/bean/valid/ValidResults.java

@@ -1,4 +1,4 @@
-package org.hsweb.web.bean.valid;
+package org.hsweb.web.bean.validator;
 
 import com.alibaba.fastjson.JSON;
 
@@ -10,7 +10,7 @@ import java.util.Collection;
  * 对象验证结果集合
  * Created by 浩 on 2015-10-10 0010.
  */
-public class ValidResults extends ArrayList<ValidResults.ValidResult> implements Serializable {
+public class ValidateResults extends ArrayList<ValidateResults.ValidResult> implements Serializable {
     private static final long serialVersionUID = 8910856253780046561L;
     /**
      * 是否验证通过

hsweb-web-core/src/main/java/org/hsweb/web/core/exception/ValidationException.java

@@ -1,23 +1,23 @@
 package org.hsweb.web.core.exception;
 
-import org.hsweb.web.bean.valid.ValidResults;
+import org.hsweb.web.bean.validator.ValidateResults;
 
 /**
  * Created by zhouhao on 16-5-12.
  */
 public class ValidationException extends BusinessException {
-    private ValidResults results;
+    private ValidateResults results;
 
     public ValidationException(String message) {
         super(message, 400);
     }
 
-    public ValidationException(ValidResults results) {
+    public ValidationException(ValidateResults results) {
         super(results.toString(), 400);
         this.results = results;
     }
 
-    public ValidResults getResults() {
+    public ValidateResults getResults() {
         return results;
     }
 }

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java

@@ -2,7 +2,7 @@ package org.hsweb.web.service.impl;
 
 import org.hsweb.web.bean.common.*;
 import org.hsweb.web.bean.po.GenericPo;
-import org.hsweb.web.bean.valid.ValidResults;
+import org.hsweb.web.bean.validator.ValidateResults;
 import org.hsweb.web.core.exception.NotFoundException;
 import org.hsweb.web.core.exception.ValidationException;
 import org.hsweb.web.dao.GenericMapper;
@@ -147,7 +147,7 @@ public abstract class AbstractServiceImpl<Po, PK> implements GenericService<Po,
 
     protected void tryValidPo(Po data) {
         Set<ConstraintViolation<Object>> set = validator.validate(data);
-        ValidResults results = new ValidResults();
+        ValidateResults results = new ValidateResults();
         if (set.isEmpty()) {
             for (ConstraintViolation<Object> violation : set) {
                 results.addResult(violation.getPropertyPath().toString(), violation.getMessage());

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java

@@ -4,7 +4,7 @@ import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtils;
 import org.hsweb.ezorm.exception.ValidationException;
 import org.hsweb.ezorm.meta.expand.Validator;
-import org.hsweb.web.bean.valid.ValidResults;
+import org.hsweb.web.bean.validator.ValidateResults;
 import org.hsweb.web.core.exception.BusinessException;
 import org.springframework.util.ReflectionUtils;
 import org.hsweb.expands.script.engine.DynamicScriptEngine;
@@ -33,7 +33,7 @@ public class GroovyDycBeanValidator implements Validator {
     }
 
     public boolean validateMap(Map<Object, Object> data, Operation operation) {
-        ValidResults results = new ValidResults();
+        ValidateResults results = new ValidateResults();
         try {
             Class validatorTargetClass = (Class) engine.execute(className, new HashMap<>()).getResult();
             Object validatorTarget = validatorTargetClass.newInstance();

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java

@@ -29,7 +29,8 @@ public class GroovyDycBeanValidatorFactory implements ValidatorFactory {
 
     private static final String[] imports = {
             "import org.hibernate.validator.constraints.*;",
-            "import javax.validation.constraints.*;"
+            "import javax.validation.constraints.*;",
+            "import org.hsweb.web.bean.validator.constraints.*;"
     };
 
     static {

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/java/JavaDycBeanValidator.java

@@ -18,11 +18,9 @@ package org.hsweb.web.service.impl.form.validator.java;
 
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtils;
-import org.hsweb.expands.script.engine.DynamicScriptEngine;
-import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 import org.hsweb.ezorm.exception.ValidationException;
 import org.hsweb.ezorm.meta.expand.Validator;
-import org.hsweb.web.bean.valid.ValidResults;
+import org.hsweb.web.bean.validator.ValidateResults;
 import org.hsweb.web.core.exception.BusinessException;
 import org.springframework.util.ReflectionUtils;
 
@@ -42,7 +40,7 @@ public class JavaDycBeanValidator implements Validator {
     }
 
     public boolean validateMap(Map<Object, Object> data, Operation operation) {
-        ValidResults results = new ValidResults();
+        ValidateResults results = new ValidateResults();
         try {
             Object validatorTarget = clazz.newInstance();
             Set<ConstraintViolation<Object>> result = new LinkedHashSet<>();