commit 2db6887f814b570ff7c303c55e4a6db441334a85
author 刘洪青 <hongqing.liu@supwisdom.com> 周二 8月 07 11:24:01 2018 +0800
committer 刘洪青 <hongqing.liu@supwisdom.com> 周二 8月 07 11:24:01 2018 +0800
tree 3f906e91a79fba1233c685933f098cdb5e4da9fb
parent 5328657e3e5c1d75d610b70bd44a63e8725d531c

修改默认返回值、返回类型

samples/common/src/main/java/com/supwisdom/leaveschool/common/util/MapBeanUtils.java

diff --git a/samples/common/src/main/java/com/supwisdom/leaveschool/common/util/MapBeanUtils.java b/samples/common/src/main/java/com/supwisdom/leaveschool/common/util/MapBeanUtils.java
index e788bac..b536b29 100644
--- a/samples/common/src/main/java/com/supwisdom/leaveschool/common/util/MapBeanUtils.java
+++ b/samples/common/src/main/java/com/supwisdom/leaveschool/common/util/MapBeanUtils.java
@@ -64,9 +64,9 @@
    * @param key
    * @return
    */
-  public static boolean getBoolean(Map<String, Object> mapBean, String key) {
+  public static Boolean getBoolean(Map<String, Object> mapBean, String key) {
 
-    return getBoolean(mapBean, key, false);
+    return getBoolean(mapBean, key, null);
   }
 
   /**
@@ -77,11 +77,11 @@
    * @param defaultValue
    * @return
    */
-  public static boolean getBoolean(Map<String, Object> mapBean, String key, Boolean defaultValue) {
+  public static Boolean getBoolean(Map<String, Object> mapBean, String key, Boolean defaultValue) {
 
     if (containsValue(mapBean, key)) {
       Boolean b = Boolean.valueOf(String.valueOf(mapBean.get(key)));
-      return b == null ? defaultValue : b.booleanValue();
+      return b == null ? defaultValue : b;
     }
 
     return defaultValue;
@@ -94,9 +94,9 @@
    * @param key
    * @return
    */
-  public static int getInteger(Map<String, Object> mapBean, String key) {
+  public static Integer getInteger(Map<String, Object> mapBean, String key) {
 
-    return getInteger(mapBean, key, -1);
+    return getInteger(mapBean, key, null);
   }
 
   /**
@@ -107,11 +107,11 @@
    * @param defaultValue
    * @return
    */
-  public static int getInteger(Map<String, Object> mapBean, String key, Integer defaultValue) {
+  public static Integer getInteger(Map<String, Object> mapBean, String key, Integer defaultValue) {
 
     if (containsValue(mapBean, key)) {
       Integer i = Integer.valueOf(String.valueOf(mapBean.get(key)));
-      return i == null ? defaultValue : i.intValue();
+      return i == null ? defaultValue : i;
     }
 
     return defaultValue;
@@ -124,9 +124,9 @@
    * @param key
    * @return
    */
-  public static long getLong(Map<String, Object> mapBean, String key) {
+  public static Long getLong(Map<String, Object> mapBean, String key) {
 
-    return getLong(mapBean, key, -1L);
+    return getLong(mapBean, key, null);
   }
 
   /**
@@ -137,11 +137,11 @@
    * @param defaultValue
    * @return
    */
-  public static long getLong(Map<String, Object> mapBean, String key, Long defaultValue) {
+  public static Long getLong(Map<String, Object> mapBean, String key, Long defaultValue) {
 
     if (containsValue(mapBean, key)) {
       Long l = Long.valueOf(String.valueOf(mapBean.get(key)));
-      return l == null ? defaultValue : l.longValue();
+      return l == null ? defaultValue : l;
     }
 
     return defaultValue;