Make Subscribers interfaces

Author: JulianVennen

CHANGELOG.md

@@ -49,6 +49,9 @@ the `WebSocketClient` or `WebSocketManager` classes directly this shouldn't requ
 
 The debug/error handler methods have been removed. Errors and debug messages are now  exclusively logged using SLF4J
 
+#### Subscribers
+The `Subscriber` classes are now interfaces and their methods have been renamed to make the more explicit and reduce
+the chance of conflicts with other overrides.
 
 ### Other
 - Arrays have been Replaced by Collection's in almost all places

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

@@ -228,7 +228,7 @@ public CompletableFuture<Boolean> serverHasStatus(Set<ServerStatus> status) {
         return future.thenApply(s -> s.hasStatus(status));
     }
 
-    private <T extends Subscriber> void addStreamSubscriber(Class<? extends Stream<T>> c, T subscriber) {
+    private <T> void addStreamSubscriber(Class<? extends Stream<T>> c, T subscriber) {
         if (!this.streams.containsKey(c)) {
             throw new IllegalStateException("There is no active stream for: " + c);
         }

src/main/java/com/exaroton/api/ws/stream/ConsoleStream.java

@@ -28,7 +28,7 @@ protected void onDataMessage(String type, JsonObject message) {
             case "line":
                 String line = gson.fromJson(message, ConsoleStreamData.class).getData();
                 for (ConsoleSubscriber subscriber : subscribers) {
-                    subscriber.line(line);
+                    subscriber.handleLine(line);
                 }
         }
     }

src/main/java/com/exaroton/api/ws/stream/HeapStream.java

@@ -22,7 +22,7 @@ protected void onDataMessage(String type, JsonObject message) {
                 HeapUsage usage = gson.fromJson(message, HeapStreamData.class).getData();
 
                 for (HeapSubscriber subscriber : subscribers) {
-                    subscriber.heap(usage);
+                    subscriber.handleHeapUsage(usage);
                 }
                 break;
         }

src/main/java/com/exaroton/api/ws/stream/ServerStatusStream.java

@@ -32,7 +32,7 @@ protected void onDataMessage(String type, JsonObject message) {
                 ws.onStatusChange();
 
                 for (ServerStatusSubscriber subscriber : subscribers) {
-                    subscriber.statusUpdate(oldServer, this.server);
+                    subscriber.handleStatusUpdate(oldServer, this.server);
                 }
                 break;
         }

src/main/java/com/exaroton/api/ws/stream/StatsStream.java

@@ -22,7 +22,7 @@ protected void onDataMessage(String type, JsonObject message) {
                 StatsData stats = gson.fromJson(message, StatsStreamData.class).getData();
 
                 for (StatsSubscriber subscriber : subscribers) {
-                    subscriber.stats(stats);
+                    subscriber.handleStats(stats);
                 }
                 break;
         }

src/main/java/com/exaroton/api/ws/stream/Stream.java

@@ -3,7 +3,6 @@
 import com.exaroton.api.server.ServerStatus;
 import com.exaroton.api.ws.WebSocketConnection;
 import com.exaroton.api.ws.data.StreamData;
-import com.exaroton.api.ws.subscriber.Subscriber;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import org.jetbrains.annotations.ApiStatus;
@@ -15,7 +14,7 @@
 import java.util.concurrent.CompletableFuture;
 
 @ApiStatus.NonExtendable
-public abstract class Stream<T extends Subscriber> {
+public abstract class Stream<T> {
 
     /**
      * Has this stream been started?

src/main/java/com/exaroton/api/ws/stream/TickStream.java

@@ -22,7 +22,7 @@ protected void onDataMessage(String type, JsonObject message) {
                 TickData tick = gson.fromJson(message, TickStreamData.class).getData();
 
                 for (TickSubscriber subscriber : subscribers) {
-                    subscriber.tick(tick);
+                    subscriber.handleTickData(tick);
                 }
                 break;
         }

src/main/java/com/exaroton/api/ws/subscriber/ConsoleSubscriber.java

@@ -1,10 +1,9 @@
 package com.exaroton.api.ws.subscriber;
 
-public abstract class ConsoleSubscriber extends Subscriber {
-
+public interface ConsoleSubscriber {
     /**
      * handle new console line
      * @param line new console line
      */
-    public abstract void line(String line);
+    void handleLine(String line);
 }

src/main/java/com/exaroton/api/ws/subscriber/HeapSubscriber.java

@@ -2,11 +2,11 @@
 
 import com.exaroton.api.ws.data.HeapUsage;
 
-public abstract class HeapSubscriber extends Subscriber {
+public interface HeapSubscriber {
 
     /**
      * handle new heap data
      * @param heap heap data
      */
-    public abstract void heap(HeapUsage heap);
+    void handleHeapUsage(HeapUsage heap);
 }