chore: 优化

Author: mcchampions

src/main/java/io/github/minecraftchampions/dodoopenjava/debug/DebugLogger.java

@@ -20,7 +20,7 @@ public class DebugLogger {
      * @param result result
      */
     public void log(@NonNull Result result) {
-        log("{} 调用api结果: {}", getBotAuthorization(), result);
+        log("{} 调用api结果: {}", botAuthorization, result);
     }
 
     /**
@@ -29,14 +29,14 @@ public void log(@NonNull Result result) {
      * @param event event
      */
     public void log(@NonNull Event event) {
-        log("{} 监听事件: {}", getBotAuthorization(), event);
+        log("{} 监听事件: {}", botAuthorization, event);
     }
 
-    public void log(@NonNull String str,Object... params) {
+    public static void log(@NonNull String str, Object... params) {
         log.debug(str,params);
     }
 
-    public void log(@NonNull String str) {
+    public static void log(@NonNull String str) {
         log.debug(str);
     }
 }

src/main/java/io/github/minecraftchampions/dodoopenjava/debug/Result.java

@@ -99,7 +99,7 @@ public class Result implements Comparable<Result> {
 
     public JSONObject getData() {
         if (isFailure()) {
-            log.error("调用Dodo开放平台api时出错,错误消息:{};状态code:{};错误数据:{}", getMessage(), getStatusCode(), getData());
+            log.error("调用Dodo开放平台api时出错,错误消息:{};状态code:{};错误数据:{}", message, statusCode, getData());
             return new JSONObject();
         }
         return jsonObjectData;
@@ -200,7 +200,7 @@ public <T> T ifFailure(@NonNull Function<Result, T> function) {
 
     @Override
     public String toString() {
-        return "Request:" + getRequestData() + "\n" + "Result:" + getData();
+        return "Request:" + requestData + "\n" + "Result:" + getData();
     }
 
     @Override

src/main/java/io/github/minecraftchampions/dodoopenjava/event/EventManager.java

@@ -22,11 +22,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.*;
 import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -109,11 +106,10 @@ public synchronized void unregisterAllListeners() {
      */
     public void unregisterListeners(@NonNull Listener listener) {
         synchronized (handlers) {
-            Set<Class<? extends Event>> set = handlers.keySet();
-            for (Class<? extends Event> clazz : set) {
-                List<SimpleEntry<Method, Object>> list = handlers.get(clazz).stream().
+            for (List<SimpleEntry<Method, Object>> simpleEntries : handlers.values()) {
+                List<SimpleEntry<Method, Object>> list = simpleEntries.stream().
                         filter(e -> e.getKey().getDeclaringClass() == listener.getClass()).toList();
-                handlers.get(clazz).removeAll(list);
+                simpleEntries.removeAll(list);
             }
         }
     }
@@ -157,8 +153,8 @@ public void fireEvent(@NonNull Event event) throws RuntimeException {
             throw new RuntimeException("未知的Event");
         }
         synchronized (handlers) {
-            if (DodoOpenJava.DEBUG_LOGGER_MAP.containsKey(getBot().getAuthorization())) {
-                DodoOpenJava.DEBUG_LOGGER_MAP.get(getBot().getAuthorization()).log(event);
+            if (DodoOpenJava.DEBUG_LOGGER_MAP.containsKey(bot.getAuthorization())) {
+                DodoOpenJava.DEBUG_LOGGER_MAP.get(bot.getAuthorization()).log(event);
             }
             fireEvent(event, handlers);
         }

src/main/java/io/github/minecraftchampions/dodoopenjava/event/WebHookEventTrigger.java

@@ -29,7 +29,7 @@
  */
 @Slf4j
 public class WebHookEventTrigger extends AbstractEventTrigger {
-    boolean isConnect = false;
+    boolean isConnect;
 
     public WebHookEventTrigger(@NonNull Bot bot, @NonNull String secretKey,
                                @NonNull String password, @NonNull File file) {
@@ -70,7 +70,7 @@ public WebHookEventTrigger(@NonNull Bot bot, @NonNull String path, @NonNull Stri
 
     private final HttpServerProvider provider = HttpServerProvider.provider();
 
-    private HttpsServer server = null;
+    private HttpsServer server;
 
     /**
      * 启动监听
@@ -82,7 +82,7 @@ public synchronized void start() {
             return;
         }
         server = provider.createHttpsServer(new InetSocketAddress(port), 1000);
-        server.createContext(getPath(), new Handler());
+        server.createContext(path, new Handler());
         server.setExecutor(new ThreadPoolExecutor(3, 10, 3,
                 TimeUnit.SECONDS, new LinkedBlockingDeque<>(3),
                 Executors.defaultThreadFactory(), new ThreadPoolExecutor.DiscardOldestPolicy()));
@@ -143,7 +143,7 @@ public synchronized void start() {
      */
     @Override
     public synchronized void close() {
-        if (server == null || isConnect()) {
+        if (server == null || isConnect) {
             return;
         }
         server.stop(0);
@@ -169,7 +169,7 @@ public class Handler implements HttpHandler {
         @Override
         public void handle(HttpExchange httpExchange) {
             try {
-                InputStream ss = httpExchange.getRequestBody();
+                httpExchange.getRequestBody();
                 String requestMethod = httpExchange.getRequestMethod();
                 Headers responseHeaders = httpExchange.getResponseHeaders();
                 responseHeaders.set("Content-Type", "application/json;charset=utf-8");

src/main/java/io/github/minecraftchampions/dodoopenjava/event/WebSocketEventTrigger.java

@@ -30,7 +30,7 @@ public boolean isConnect() {
         return mWebSocket != null && mWebSocket.isOpen();
     }
 
-    public WebSocketClient mWebSocket = null;
+    public WebSocketClient mWebSocket;
 
     public static final long PING_INTERVAL = 20 * 1000;
 
@@ -39,7 +39,7 @@ public WebSocketEventTrigger(Bot bot) {
         this.bot = bot;
     }
 
-    private int reacquireCount = 0;
+    private int reacquireCount;
 
     private final int reacquireMaxCount = 100;
 

src/main/java/io/github/minecraftchampions/dodoopenjava/event/events/v2/member/MemberLeaveEvent.java

@@ -104,7 +104,7 @@ public MemberLeaveEvent(JSONObject json) {
      * @param type 类型
      * @return 类型
      */
-    public String intLeaveTypeToLeaveType(Integer type) {
+    public static String intLeaveTypeToLeaveType(Integer type) {
         return switch (type) {
             case 1 -> "主动";
             case 2 -> "被踢";

src/main/java/io/github/minecraftchampions/dodoopenjava/impl/BotImpl.java

@@ -17,7 +17,6 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.json.JSONObject;
 
 import java.util.Objects;
 
@@ -31,7 +30,7 @@
 @Slf4j
 public class BotImpl implements Bot {
     public String toString() {
-        return getClientId();
+        return clientId;
     }
 
     /**
@@ -105,7 +104,7 @@ public synchronized void registerListener(@NonNull Listener listener) {
         if (!eventTrigger.isConnect()) {
             eventTrigger.start();
         }
-        getEventManager().registerListener(listener);
+        eventManager.registerListener(listener);
     }
 
     /**
@@ -121,7 +120,7 @@ public synchronized void removeEventTrigger() {
 
     @Override
     public Island getIsland(@NonNull String islandSourceId) {
-        Result result = getApi().getIslandApi().getIslandList();
+        Result result = api.getIslandApi().getIslandList();
         if (result.isFailure()) {
             log.error("获取频道信息失败, 错误消息:{};状态code:{};错误数据:{}", result.getMessage(), result.getStatusCode(), result.getData());
             return null;
@@ -220,7 +219,7 @@ public void disable() {
      */
     @Override
     public String getName() {
-        return this.getApi().getBotApi().getBotInfo().getData().getString("nickName");
+        return this.api.getBotApi().getBotInfo().getData().getString("nickName");
     }
 
     /**
@@ -230,7 +229,7 @@ public String getName() {
      */
     @Override
     public String getDodoSourceId() {
-        return this.getApi().getBotApi().getBotInfo().getData().getString("dodoSourceId");
+        return this.api.getBotApi().getBotInfo().getData().getString("dodoSourceId");
     }
 
     /**
@@ -240,8 +239,7 @@ public String getDodoSourceId() {
      */
     @Override
     public String getAvatarUrl() {
-        JSONObject jsonObject = new JSONObject();
-        return this.getApi().getBotApi().getBotInfo().getData().getString("avatarUrl");
+        return this.api.getBotApi().getBotInfo().getData().getString("avatarUrl");
     }
 
     /**

src/main/java/io/github/minecraftchampions/dodoopenjava/impl/ChannelImpl.java

@@ -68,11 +68,11 @@ public String getGroupName() {
 
     @Override
     public Result delete() {
-        return bot.getApi().getChannelApi().deleteChannel(getIslandSourceId(), getChannelId());
+        return bot.getApi().getChannelApi().deleteChannel(islandSourceId, channelId);
     }
 
     @Override
     public Island getIsland() {
-        return new IslandImpl(getIslandSourceId(), bot);
+        return new IslandImpl(islandSourceId, bot);
     }
 }