fix:默认值方法调用禁止返回null问题

ronghao · May 23, 2019 · 0d53866 · 0d53866
1 parent 9344a94
commit 0d53866
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/src/main/java/com/haohaohu/cachemanagesample/MainActivity.java b/app/src/main/java/com/haohaohu/cachemanagesample/MainActivity.java
@@ -157,7 +157,7 @@ public void onClick(View v) {
  //key20未存储的数据，返回默认值
  Test key21Value = CacheUtil.get(CacheUtil.translateKey("null1"), Test.class, true);
  //key21未存储的数据，且无默认构造方法,返回null
- Integer key22Value = CacheUtil.get("key22", Integer.class, 100,true);
+ int key22Value = CacheUtil.get("key22", int.class, 100,true);
  //key21已存储的数据，返回默认值
 
  String value = "测试:\n"
@@ -225,7 +225,7 @@ public void onClick(View v) {
  + (key21Value != null ? key21Value.toString() : "null")
  + "\n"
  + "保存实体对象[Test类](有默认返回对象):"
- + (key22Value != null ? key22Value.toString() : "null")
+ + (String.valueOf(key22Value))
  + "\n";
  mTextView.setText(value);
  }

diff --git a/library/src/main/java/com/haohaohu/cachemanage/CacheUtil.java b/library/src/main/java/com/haohaohu/cachemanage/CacheUtil.java
@@ -363,7 +363,6 @@ public static <T> T get(String key, Class<T> classOfT, boolean isEncrypt) {
  * @param t 错误情况下返回数据
  * @return 实体对象
  */
- @Nullable
  public static <T> T get(String key, Class<T> classOfT, T t) {
  return get(key, classOfT, t, getConfig().isEncrypt());
  }
@@ -379,10 +378,9 @@ public static <T> T get(String key, Class<T> classOfT, T t) {
  * @param isEncrypt 是否加密
  * @return 实体对象
  */
- @Nullable
- public static <T> T get(String key, Class<T> classOfT, T t, boolean isEncrypt) {
+ public static <T> T get(String key, Class<T> classOfT, @NonNull T t, boolean isEncrypt) {
  if (TextUtils.isEmpty(key) || classOfT == null) {
- return null;
+ return t;
  }
  try {
  LockUtil.getInstance().readLock().lock();
@@ -413,7 +411,7 @@ public static <T> T get(String key, Class<T> classOfT, T t, boolean isEncrypt) {
  }
  return t;
  } catch (Exception e) {
- return null;
+ return t;
  } finally {
  LockUtil.getInstance().readLock().unlock();
  }