optimize checker for bean

easepan · easepan · commit 6d84be035917 · 2018-09-23T10:24:43.000+08:00
diff --git a/src/main/java/com/zhazhapan/util/Checker.java b/src/main/java/com/zhazhapan/util/Checker.java
@@ -280,7 +280,7 @@ public static <T> CheckResult<T> checkBean(Object bean, Map<String, Object> map)
         CheckResult<T> result = new CheckResult<>();
         if (isNull(bean)) {
             result.passed = false;
-            result.resultObject = result.errorResult();
+            result.resultObject = CheckResult.getErrorResult();
             return result;
         }
         Field[] fields = bean.getClass().getDeclaredFields();
diff --git a/src/main/java/com/zhazhapan/util/model/CheckResult.java b/src/main/java/com/zhazhapan/util/model/CheckResult.java
@@ -26,8 +26,8 @@ public class CheckResult<T> {
      *
      * @since 1.1.0
      */
-    public static ResultObject getErrorResult(int code, String message) {
-        return new ResultObject(code, message, ValueConsts.ERROR_EN);
+    public static <T> ResultObject<T> getErrorResult(int code, String message) {
+        return new ResultObject<>(code, message, ValueConsts.ERROR_EN);
     }
 
     /**
@@ -37,7 +37,7 @@ public static ResultObject getErrorResult(int code, String message) {
      *
      * @since 1.1.0
      */
-    public static ResultObject getErrorResult() {
+    public static <T> ResultObject<T> getErrorResult() {
         return getErrorResult(DEFAULT_ERROR_CODE, DEFAULT_ERROR_MESSAGE);
     }
 
@@ -50,7 +50,7 @@ public static ResultObject getErrorResult() {
      *
      * @since 1.1.0
      */
-    public static ResultObject getErrorResult(int code) {
+    public static <T> ResultObject<T> getErrorResult(int code) {
         return getErrorResult(code, DEFAULT_ERROR_MESSAGE);
     }
 
@@ -63,58 +63,7 @@ public static ResultObject getErrorResult(int code) {
      *
      * @since 1.1.0
      */
-    public static ResultObject getErrorResult(String message) {
+    public static <T> ResultObject<T> getErrorResult(String message) {
         return getErrorResult(DEFAULT_ERROR_CODE, message);
     }
-
-    /**
-     * 获取失败的结果
-     *
-     * @param code 错误码
-     * @param message 消息
-     *
-     * @return {@link ResultObject}
-     *
-     * @since 1.1.1
-     */
-    public ResultObject<T> errorResult(int code, String message) {
-        return new ResultObject<>(code, message, ValueConsts.ERROR_EN);
-    }
-
-    /**
-     * 获取失败的结果
-     *
-     * @return {@link ResultObject}
-     *
-     * @since 1.1.1
-     */
-    public ResultObject<T> errorResult() {
-        return errorResult(DEFAULT_ERROR_CODE, DEFAULT_ERROR_MESSAGE);
-    }
-
-    /**
-     * 获取失败的结果
-     *
-     * @param code 错误码
-     *
-     * @return {@link ResultObject}
-     *
-     * @since 1.1.1
-     */
-    public ResultObject<T> errorResult(int code) {
-        return errorResult(code, DEFAULT_ERROR_MESSAGE);
-    }
-
-    /**
-     * 获取失败的结果
-     *
-     * @param message 消息
-     *
-     * @return {@link ResultObject}
-     *
-     * @since 1.1.1
-     */
-    public ResultObject<T> errorResult(String message) {
-        return errorResult(DEFAULT_ERROR_CODE, message);
-    }
 }
diff --git a/src/test/java/com/zhazhapan/util/CheckerTest.java b/src/test/java/com/zhazhapan/util/CheckerTest.java
@@ -306,6 +306,10 @@ public void isNotIn1() {
 
     @Test
     public void checkBean() {
+        // 测试NULL
+        CheckResult<TestBean> errorResult = Checker.checkBean(null);
+        assert !errorResult.passed;
+
         TestBean bean = new TestBean();
         bean.none = false;
 
@@ -346,6 +350,8 @@ public void checkBean() {
         result = Checker.checkBean(bean);
         System.out.println(JSONObject.toJSON(result.resultObject));
         assert result.passed;
+
+        System.out.println(errorResult.resultObject.setData(bean));
         System.out.println(result.resultObject.setData(bean));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public static <T> CheckResult<T> checkBean(Object bean, Map<String, Object> map)`
`280`	`280`	`CheckResult<T> result = new CheckResult<>();`
`281`	`281`	`if (isNull(bean)) {`
`282`	`282`	`result.passed = false;`
`283`		`- result.resultObject = result.errorResult();`
	`283`	`+ result.resultObject = CheckResult.getErrorResult();`
`284`	`284`	`return result;`
`285`	`285`	`}`
`286`	`286`	`Field[] fields = bean.getClass().getDeclaredFields();`