浏览代码

优化代码结构

zhouhao 6 年之前
父节点
当前提交
74642010e5

+ 5 - 0
hsweb-core/pom.xml

@@ -54,5 +54,10 @@
             <artifactId>groovy-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

+ 1 - 7
hsweb-core/src/main/java/org/hswebframework/web/bean/FastBeanCopier.java

@@ -37,13 +37,7 @@ public final class FastBeanCopier {
     @SuppressWarnings("all")
     public static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
 
-    private static BeanFactory BEAN_FACTORY = new BeanFactory() {
-        @Override
-        @SneakyThrows
-        public <T> T newInstance(Class<T> beanType) {
-            return beanType == Map.class ? (T) new HashMap<>() : beanType.newInstance();
-        }
-    };
+    private static BeanFactory BEAN_FACTORY;
 
     public static final DefaultConverter DEFAULT_CONVERT;
 

+ 10 - 6
hsweb-core/src/main/java/org/hswebframework/web/validate/SimpleValidateResults.java

@@ -22,19 +22,23 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author zhouhao
  */
 public class SimpleValidateResults implements ValidateResults {
 
-    private static final long serialVersionUID = -3355828475840578917L;
-    private List<ValidateResults.Result> results = new ArrayList<>();
+    private static final long                         serialVersionUID = -3355828475840578917L;
+    private              List<ValidateResults.Result> results          = new ArrayList<>();
 
     public SimpleValidateResults addResult(String field, String message) {
         results.add(new Result(field, message));
         return this;
     }
 
+    public SimpleValidateResults addResult(ValidateResults.Result result) {
+        results.add(result);
+        return this;
+    }
+
     @Override
     public boolean isSuccess() {
         return results == null || results.isEmpty();
@@ -46,9 +50,9 @@ public class SimpleValidateResults implements ValidateResults {
     }
 
     class Result implements ValidateResults.Result {
-        private static final long serialVersionUID = -4717219071013488363L;
-        private String field;
-        private String message;
+        private static final long   serialVersionUID = -4717219071013488363L;
+        private              String field;
+        private              String message;
 
         public Result(String field, String message) {
             this.field = field;