Use StreamName enum in (un)subscribe methods

Author: JulianVennen

CHANGELOG.md

@@ -13,6 +13,7 @@ This library no longer depends directly on any SLF4J implementation. If you want
 from this library, you must include an SLF4J implementation in your project.
 
 ### Other
+- `Server#subscribe` and `Server#unsubscribe` now accept the `StreamName` enum instead of any string
 - Arrays have been Replaced by Collection's in almost all places
 - Config options now return a generic type instead of `Object`
 - Removed `ExarotonClient#getGson()` and `WebsocketClient#getGson()`

src/main/java/com/exaroton/api/server/Server.java

@@ -4,6 +4,7 @@
 import com.exaroton.api.ExarotonClient;
 import com.exaroton.api.request.server.*;
 import com.exaroton.api.ws.WebSocketManager;
+import com.exaroton.api.ws.stream.StreamName;
 import com.exaroton.api.ws.subscriber.*;
 import com.google.gson.Gson;
 import org.jetbrains.annotations.ApiStatus;
@@ -451,8 +452,8 @@ public void subscribe() {
      *
      * @param streams stream names
      */
-    public void subscribe(String... streams) {
-        for (String stream : streams) {
+    public void subscribe(StreamName... streams) {
+        for (StreamName stream : streams) {
             if (this.webSocket == null) {
                 this.subscribe();
             }
@@ -475,9 +476,9 @@ public void unsubscribe() {
      *
      * @param streams stream names
      */
-    public void unsubscribe(String... streams) {
+    public void unsubscribe(StreamName... streams) {
         if (this.webSocket == null) throw new RuntimeException("No websocket connection active.");
-        for (String stream : streams) {
+        for (StreamName stream : streams) {
             this.webSocket.unsubscribe(stream);
         }
     }

src/main/java/com/exaroton/api/ws/WebSocketManager.java

@@ -6,12 +6,14 @@
 import com.exaroton.api.ws.stream.*;
 import com.exaroton.api.ws.subscriber.*;
 import com.google.gson.Gson;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
 
+@ApiStatus.Internal
 public final class WebSocketManager {
     private final Gson gson;
 
@@ -166,35 +168,37 @@ public void handleOpen() {
     /**
      * subscribe to a stream if it is not already active
      *
-     * @param stream stream name
+     * @param name stream name
      */
-    public void subscribe(String stream) {
-        if (stream == null) throw new IllegalArgumentException("No stream specified");
+    public void subscribe(@NotNull StreamName name) {
+        Objects.requireNonNull(name);
 
-        Stream s;
-        final StreamName name = StreamName.get(stream);
+        if (streams.containsKey(name)) {
+            return;
+        }
+
+        Stream stream;
         if (name == StreamName.CONSOLE) {
-            s = new ConsoleStream(this, this.gson);
+            stream = new ConsoleStream(this, this.gson);
         } else {
-            s = new Stream(this, this.gson, name);
+            stream = new Stream(this, this.gson, name);
         }
 
-        this.streams.put(name, s);
-        s.start();
+        this.streams.put(name, stream);
+        stream.start();
     }
 
     /**
      * unsubscribe from a stream
      *
-     * @param stream stream name
+     * @param name stream name
      */
-    public void unsubscribe(String stream) {
-        if (stream == null) throw new IllegalArgumentException("No stream specified");
+    public void unsubscribe(@NotNull StreamName name) {
+        Objects.requireNonNull(name);
 
-        final StreamName name = StreamName.get(stream);
-        Stream s = this.streams.get(name);
-        if (s != null) {
-            s.stop();
+        Stream stream = this.streams.get(name);
+        if (stream != null) {
+            stream.stop();
             this.streams.remove(name);
         }
     }