From 556e6ad2a0980eef488ee8465982ad3d95e8bb58 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Fri, 27 May 2022 13:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=90=E4=BA=9Bjava?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8B=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
 =?UTF-8?q?IMResult<Void>=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdk/utilities/AdminHttpUtils.java         | 15 +-------------
 .../sdk/utilities/ChannelHttpUtils.java       | 14 +------------
 .../wildfirechat/sdk/utilities/JsonUtils.java | 20 +++++++++++++++++++
 .../sdk/utilities/RobotHttpUtils.java         | 14 +------------
 4 files changed, 23 insertions(+), 40 deletions(-)
 create mode 100644 sdk/src/main/java/cn/wildfirechat/sdk/utilities/JsonUtils.java

diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java
index 98c45707..94f77ea6 100644
--- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class AdminHttpUtils {
+public class AdminHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(AdminHttpUtils.class);
 
     private static String adminUrl;
@@ -152,17 +152,4 @@ public class AdminHttpUtils {
             }
         }
     }
-
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
-    }
-
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
-    }
-
 }
diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java
index eeae299d..85918015 100644
--- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class ChannelHttpUtils {
+public class ChannelHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(ChannelHttpUtils.class);
 
     private String imurl;
@@ -103,18 +103,6 @@ public class ChannelHttpUtils {
         }
     }
 
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
-    }
-
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
-    }
-
     public String getChannelId() {
         return channelId;
     }
diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/JsonUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/JsonUtils.java
new file mode 100644
index 00000000..00ed154c
--- /dev/null
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/JsonUtils.java
@@ -0,0 +1,20 @@
+package cn.wildfirechat.sdk.utilities;
+
+import cn.wildfirechat.sdk.model.IMResult;
+import com.google.gson.Gson;
+import ikidou.reflect.TypeBuilder;
+
+public class JsonUtils {
+
+    public static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
+        TypeBuilder builder = TypeBuilder.newInstance(IMResult.class);
+        if (!clazz.equals(Void.class)) {
+            builder.addTypeParam(clazz);
+        }
+        return new Gson().fromJson(content, builder.build());
+    }
+
+    public static boolean isNullOrEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
+}
diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java
index 523ae752..e3747a58 100644
--- a/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class RobotHttpUtils {
+public class RobotHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(RobotHttpUtils.class);
 
     private final String url;
@@ -106,18 +106,6 @@ public class RobotHttpUtils {
         }
     }
 
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
-    }
-
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
-    }
-
     public String getRobotId() {
         return robotId;
     }