1. Fix static class

boticord · Dec 29, 2022 · 128bb89 · 128bb89
1 parent 662ac9c
commit 128bb89
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.boticordjava.api</groupId>
     <artifactId>boticordjava</artifactId>
-    <version>4.0</version>
+    <version>4.1</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.json/json -->
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>23.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/org/boticordjava/api/entity/webhooks/observer/ListenerAdapter.java b/src/main/java/org/boticordjava/api/entity/webhooks/observer/ListenerAdapter.java
@@ -9,7 +9,10 @@
 public abstract class ListenerAdapter {
 
     public void onTestEvent(@NotNull TestMessage event) {}
+
     public void onCommentEvent(@NotNull CommentAction event) {}
+
     public void onBotBumpEvent(@NotNull BotBump event) {}
+
     public void onServerBumpEvent(@NotNull ServerBump event) {}
 }
diff --git a/...i/entity/webhooks/observer/Initiator.java → ...pi/entity/webhooks/observer/Observer.java b/...i/entity/webhooks/observer/Initiator.java → ...pi/entity/webhooks/observer/Observer.java
@@ -6,20 +6,16 @@
 import org.boticordjava.api.entity.webhooks.comment.CommentAction;
 import org.boticordjava.api.entity.webhooks.comment.Type;
 import org.boticordjava.api.entity.webhooks.test.TestMessage;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-public class Initiator {
+public class Observer {
 
     private final List<ListenerAdapter> listeners = new ArrayList<>();
 
-    public void addListener(ListenerAdapter listenerAdapter) {
-        listeners.add(listenerAdapter);
-    }
-
-    public void addListener(ListenerAdapter... listenerAdapter) {
-        listeners.addAll(List.of(listenerAdapter));
+    public void addListener(@NotNull ListenerAdapter... listenerAdapter) {
+        Collections.addAll(this.listeners, listenerAdapter);
     }
 
     public void handle(WebhookListener commentAction) {
@@ -46,4 +42,4 @@ public void handle(WebhookListener commentAction) {
             }
         }
     }
-}
+}
diff --git a/src/main/java/org/boticordjava/api/impl/WebSocket.java b/src/main/java/org/boticordjava/api/impl/WebSocket.java
@@ -12,7 +12,7 @@
 import org.boticordjava.api.entity.webhooks.bump.server.ServerBump;
 import org.boticordjava.api.entity.webhooks.comment.CommentAction;
 import org.boticordjava.api.entity.webhooks.comment.Type;
-import org.boticordjava.api.entity.webhooks.observer.Initiator;
+import org.boticordjava.api.entity.webhooks.observer.Observer;
 import org.boticordjava.api.entity.webhooks.observer.ListenerAdapter;
 import org.boticordjava.api.entity.webhooks.test.TestMessage;
 import org.boticordjava.api.io.DefaultResponseTransformer;
@@ -35,7 +35,7 @@ public class WebSocket {
     private final String XHookKey;
     private final String path;
     private final int port;
-    private final static Initiator INITIATOR = new Initiator();
+    private final Observer Observer = new Observer();
 
     /**
      * @param xHookKey String X-Hook-Key for filter request
@@ -137,18 +137,14 @@ public void handle(HttpExchange t) {
     private <E> void webhooks(ResponseTransformer<E> responseTransformer, String response) {
         if (responseTransformer != null) {
             WebhookListener transform = (WebhookListener) responseTransformer.transform(response);
-            INITIATOR.handle(transform);
+            Observer.handle(transform);
         }
     }
 
-    public void addListener(ListenerAdapter listenerAdapter) {
-        INITIATOR.addListener(listenerAdapter);
-    }
     public void addListener(ListenerAdapter... listenerAdapter) {
-        INITIATOR.addListener(listenerAdapter);
+        Observer.addListener(listenerAdapter);
     }
 
-
     public String getXHookKey() {
         return XHookKey;
     }