Merge pull request #89 from jwdeveloper/develop-1.8.2

Develop 1.8.2

Author: jwdeveloper

API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java

@@ -0,0 +1,18 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+/**
+ * HIGHEST 1
+ * HIGH 2
+ * NORMAL 3
+ * LOW 4
+ * LOWEST 5
+ */
+public enum Priority {
+    LOWEST(2), LOW(1), NORMAL(0), HIGH(-1), HIGHEST(-2);
+
+    public final int value;
+
+    Priority(int value) {
+        this.value = value;
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventObserver.java

@@ -28,5 +28,14 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TikTokEventObserver
 {
+    /**
+     * When more than one method listen for certain Event, you can specify the method priority
+     * @see Priority
+     */
+    Priority priority() default Priority.NORMAL;
 
+    /**
+     * When true, action is invoked on a thread, from the threads pool
+     */
+    boolean async() default false;
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java

@@ -43,8 +43,6 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
      true if battle is finished otherwise false
      */
     private final boolean finished;
-    @Getter(AccessLevel.NONE)
-    private final boolean oneVsOne;
     private final List<Team> teams;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
@@ -55,7 +53,6 @@ public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         if (msg.getHostTeamCount() == 2) { // 1v1 battle
             teams.add(new Team1v1(msg.getHostTeam(0), msg));
             teams.add(new Team1v1(msg.getHostTeam(1), msg));
-            oneVsOne = true;
         } else { // 2v2 battle
             if (isFinished()) {
                 teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
@@ -64,7 +61,6 @@ public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
                 teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
                 teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
             }
-            oneVsOne = false;
         }
 
         // Info:
@@ -74,10 +70,14 @@ public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
     }
 
     public boolean is1v1() {
-        return oneVsOne;
+        return teams.get(0) instanceof Team1v1;
     }
 
     public boolean is2v2() {
-        return !oneVsOne;
+        return teams.get(0) instanceof Team2v2;
+    }
+
+    public boolean isTie() {
+        return isFinished() && teams.get(0).getTotalPoints() == teams.get(1).getTotalPoints();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team.java

@@ -22,7 +22,12 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.battles;
 
+import lombok.Getter;
+
 public abstract class Team {
+    /** Value >= 0 when finished otherwise -1 */
+    @Getter protected int totalPoints;
+
     /**
      * Provides a check for verifying if this team represents a 1v1 Team.
      * @return true if this team is of type {@link Team1v1}, false otherwise.

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team1v1.java

@@ -29,10 +29,7 @@
 import java.util.*;
 
 @Getter
-public class Team1v1 extends Team
-{
-    /** Value >= 0 when finished otherwise -1 */
-    private final int totalPoints;
+public class Team1v1 extends Team {
     private final int winStreak;
     private final User host;
     private final List<Viewer> viewers;

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team2v2.java

@@ -30,9 +30,6 @@
 
 @Getter
 public class Team2v2 extends Team {
-    /** Value >= 0 when finished otherwise -1 */
-    private final int totalPoints;
-
     private final List<User> hosts;
     private final List<Viewer> viewers;
 

API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java

@@ -25,16 +25,13 @@
 import java.util.List;
 
 /**
- *  You can dynamically add or removing TikTokEventListener
- *
- * @see TikTokEventListener
- *
+ *  Manage events listeners objects
  */
 public interface ListenersManager
 {
-    List<TikTokEventListener> getListeners();
+    List<Object> getListeners();
 
-    void addListener(TikTokEventListener listener);
+    void addListener(Object listener);
 
-    void removeListener(TikTokEventListener listener);
+    void removeListener(Object listener);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListener.java

@@ -40,7 +40,7 @@
  * {@code
  * 	public static class CustomListener implements TikTokEventListener
  *  {
- *  	@TikTokEventObserver
+ *    @TikTokEventObserver
  *      public void onError(LiveClient liveClient, TikTokErrorEvent event)
  *      {
  *      	System.out.println(event.getException().getMessage());
@@ -67,7 +67,9 @@
  *  }
  *  </pre>
  */
-public interface TikTokEventListener
-{
+//TODO I think this interface can be removed, since we are using,
+//annotation @TikTokEventHandler to check methods that are events
+@Deprecated(forRemoval = true, since = "1.8.1 (This interface is not longer needed, please remove it from your class)")
+public interface TikTokEventListener {
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/LiveClientBuilder.java

@@ -24,7 +24,6 @@
 
 import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
-import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.mappers.LiveMapper;
 
@@ -33,59 +32,63 @@
 
 public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
 
+
     /**
      * This method is triggered after default mappings are registered
      * It could be used to OVERRIDE behaviour of mappings and implement custom behaviour
-     *
+     * <p>
      * Be aware if for example you override WebcastGiftEvent, onGiftEvent() will not be working
      *
      * @param onCustomMappings lambda method
      * @return
      */
-    LiveClientBuilder onMapping(Consumer<LiveMapper> onCustomMappings);
+    LiveClientBuilder mappings(Consumer<LiveMapper> onCustomMappings);
 
+    @Deprecated(forRemoval = true, since = "1.8.2 use `mappings` method instead")
+    LiveClientBuilder onMappings(Consumer<LiveMapper> onCustomMappings);
 
     /**
      * Configuration of client settings
-     * @see LiveClientSettings
+     *
      * @param onConfigure
      * @return
+     * @see LiveClientSettings
      */
     LiveClientBuilder configure(Consumer<LiveClientSettings> onConfigure);
 
     /**
-     * @see TikTokEventListener
      * Adding events listener class, its fancy way to register events without using lamda method
      * but actual method in class that implements TikTokEventListener
+     *
      * @return
      */
-    LiveClientBuilder addListener(TikTokEventListener listener);
+    LiveClientBuilder addListener(Object listener);
 
 
     /**
      * Allows you to use own implementation of internal TikTokLive dependencies,
      * when the default implementation does not meet your needs
      *
-     *
      * @param onCustomizeDependencies access to dependency container
      * @return
      */
     LiveClientBuilder customize(Consumer<DependanceContainerBuilder> onCustomizeDependencies);
 
     /**
      * Builds new instance of the LiveClient
+     *
      * @return LiveClient object
      */
     LiveClient build();
 
     /**
      * Builds new instance of the LiveClient and connects to live
+     *
      * @return LiveClient object
      */
     LiveClient buildAndConnect();
 
     /**
-     *
      * @return LiveClient object and connects to TikTok live asynchronously
      */
     CompletableFuture<LiveClient> buildAndConnectAsync();

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/SocketClient.java renamed to API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java

@@ -24,9 +24,8 @@
 
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 
-public interface SocketClient {
+public interface LiveSocketClient {
     void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient);
     void stop();
 }