全面推进lambok

Author: mcchampions

command/pom.xml

@@ -61,5 +61,9 @@
             <groupId>io.github.minecraftchampions.dodoopenjava</groupId>
             <artifactId>core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 </project>

command/src/main/java/io/github/minecraftchampions/dodoopenjava/command/CommandSender.java

@@ -3,92 +3,71 @@
 import io.github.minecraftchampions.dodoopenjava.api.v2.ChannelMessageApi;
 import io.github.minecraftchampions.dodoopenjava.api.v2.MemberApi;
 import io.github.minecraftchampions.dodoopenjava.api.v2.RoleApi;
+import lombok.Getter;
 import org.json.JSONObject;
 
 import java.io.IOException;
 
 /**
  * 命令发送者
  */
+@Getter
 public class CommandSender {
+    /**
+     * -- GETTER --
+     *  获取DodoID
+     *
+     */
     public String SenderDodoSourceId;
 
-    public String ChannelId;
-
-    public String IslandSourceId;
-
-    public String AvatarUrl;
-
-    public String SenderNickName;
-
-    public String SenderName;
-
-    public String JoinTime;
-
-    public String MessageId;
-
     /**
-     * 获取DodoID
+     * -- GETTER --
+     *  获取频道ID
      *
-     * @return DodoID
      */
-    public String getSenderDodoSourceId() {
-        return this.SenderDodoSourceId;
-    }
+    public String ChannelId;
 
     /**
-     * 获取频道ID
+     * -- GETTER --
+     *  获取群号
      *
-     * @return 频道ID
      */
-    public String getChannelId() {
-        return this.ChannelId;
-    }
+    public String IslandSourceId;
 
     /**
-     * 获取群号
+     * -- GETTER --
+     *  获取头像URL
      *
-     * @return 群号
      */
-    public String getIslandSourceId() {
-        return this.IslandSourceId;
-    }
+    public String AvatarUrl;
 
     /**
-     * 获取头像URL
+     * -- GETTER --
+     *  获取发送者群昵称
      *
-     * @return 头像URL
      */
-    public String getAvatarUrl() {
-        return this.AvatarUrl;
-    }
+    public String SenderNickName;
 
     /**
-     * 获取发送者群昵称
+     * -- GETTER --
+     *  获取发送者原本名称
      *
-     * @return 群昵称
      */
-    public String getSenderNickName() {
-        return this.SenderNickName;
-    }
+    public String SenderName;
 
     /**
-     * 获取发送者原本名称
+     * -- GETTER --
+     *  获取加入时间
      *
-     * @return 原名
      */
-    public String getSenderName() {
-        return this.SenderName;
-    }
+    public String JoinTime;
 
     /**
-     * 获取加入时间
+     * -- GETTER --
+     *  获取触发命令的消息ID
      *
-     * @return 加入时间
      */
-    public String getJoinTime() {
-        return this.JoinTime;
-    }
+    public String MessageId;
 
     /**
      * 初始化发送者这个类型

configuration/pom.xml

@@ -54,5 +54,9 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 </project>

configuration/src/main/java/io/github/minecraftchampions/dodoopenjava/configuration/MemoryConfiguration.java

@@ -1,5 +1,6 @@
 package io.github.minecraftchampions.dodoopenjava.configuration;
 
+import lombok.Getter;
 import org.apache.commons.lang3.Validate;
 
 import java.util.Map;
@@ -8,6 +9,7 @@
  * 这是一个配置实现，不保存或从任何源加载，只将所有值存储在内存中。这对于提供缺省值的临时配置非常有用。
  */
 public class MemoryConfiguration extends MemorySection implements Configuration {
+    @Getter
     protected Configuration defaults;
     protected MemoryConfigurationOptions options;
 
@@ -58,10 +60,6 @@ public void setDefaults(Configuration defaults) {
         this.defaults = defaults;
     }
 
-    public Configuration getDefaults() {
-        return defaults;
-    }
-
     @Override
     public ConfigurationSection getParent() {
         return null;

configuration/src/main/java/io/github/minecraftchampions/dodoopenjava/configuration/MemorySection.java

@@ -1,6 +1,7 @@
 package io.github.minecraftchampions.dodoopenjava.configuration;
 
 import io.github.minecraftchampions.dodoopenjava.utils.NumberUtil;
+import lombok.Getter;
 import okio.ByteString;
 import org.apache.commons.lang3.Validate;
 
@@ -11,7 +12,9 @@
  */
 public class MemorySection implements ConfigurationSection {
     protected final Map<String, Object> map = new LinkedHashMap<>();
+    @Getter
     private final Configuration root;
+    @Getter
     private final ConfigurationSection parent;
     private final String path;
     private final String fullPath;
@@ -107,14 +110,6 @@ public String getName() {
         return path;
     }
 
-    public Configuration getRoot() {
-        return root;
-    }
-
-    public ConfigurationSection getParent() {
-        return parent;
-    }
-
     public void addDefault(String path, Object value) {
         Validate.notNull(path, "Path cannot be null");
 

configuration/src/main/java/io/github/minecraftchampions/dodoopenjava/configuration/file/YamlConfiguration.java

@@ -56,7 +56,7 @@ public void loadFromString(String contents) throws InvalidConfigurationException
         }
 
         String header = parseHeader(contents);
-        if (header.length() > 0) {
+        if (!header.isEmpty()) {
             options().header(header);
         }
 
@@ -97,7 +97,7 @@ protected String parseHeader(String input) {
                 }
 
                 foundHeader = true;
-            } else if ((foundHeader) && (line.length() == 0)) {
+            } else if ((foundHeader) && (line.isEmpty())) {
                 result.append("\n");
             } else if (foundHeader) {
                 readingHeader = false;
@@ -117,7 +117,7 @@ protected String buildHeader() {
             if ((def instanceof FileConfiguration filedefaults)) {
                 String defaultsHeader = filedefaults.buildHeader();
 
-                if ((defaultsHeader != null) && (defaultsHeader.length() > 0)) {
+                if ((defaultsHeader != null) && (!defaultsHeader.isEmpty())) {
                     return defaultsHeader;
                 }
             }
@@ -134,7 +134,7 @@ protected String buildHeader() {
         for (int i = lines.length - 1; i >= 0; i--) {
             builder.insert(0, "\n");
 
-            if ((startedHeader) || (lines[i].length() != 0)) {
+            if ((startedHeader) || (!lines[i].isEmpty())) {
                 builder.insert(0, lines[i]);
                 builder.insert(0, COMMENT_PREFIX);
                 startedHeader = true;

core/pom.xml

@@ -38,5 +38,9 @@
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 </project>

core/src/main/java/io/github/minecraftchampions/dodoopenjava/card/component/Component.java

@@ -1,12 +1,14 @@
 package io.github.minecraftchampions.dodoopenjava.card.component;
 
+import lombok.Getter;
 import org.json.JSONObject;
 
 import java.io.Serializable;
 
 /**
  * 组件
  */
+@Getter
 public abstract class Component implements Serializable {
     protected JSONObject jsonCard = new JSONObject();
 
@@ -16,7 +18,4 @@ public abstract class Component implements Serializable {
     public Component() {
     }
 
-    public JSONObject getJsonCard() {
-        return jsonCard;
-    }
 }

event-core/pom.xml

@@ -50,5 +50,9 @@
             <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 </project>

event-core/src/main/java/io/github/minecraftchampions/dodoopenjava/event/EventManage.java

@@ -129,7 +129,6 @@ public static Class<?> getEventTriggerClass() {
      * @param an Authorization
      */
     public static void init(String an) {
-        Class<?> clazz = getEventTriggerClass();
         try {
             Class.forName("io.github.minecraftchampions.dodoopenjava.event.websocket.EventTrigger");
             getEventTriggerClass().getMethod("main", String.class).invoke(null, an);