Update version in pom.xml

TikTokEventListener method with parameter TikTokEvent was invalid

.github/workflows/maven-publish.yml

@@ -76,6 +76,8 @@ jobs:
             git add API/pom.xml
             git add Client/pom.xml
             git add TestApplication/pom.xml
+            git add Tools-EventsCollector/pom.xml
+            git add Tools-ReadmeGenerator/pom.xml
             git add Tools/pom.xml
             git commit -m "Update version in pom.xml"
     - name: Push changes

API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java

@@ -7,11 +7,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@Value
+@Getter
 public class Picture {
 
   List<String> urls;
-
   public Picture(io.github.jwdeveloper.tiktok.messages.Image profilePicture) {
     this.urls = profilePicture.getUrlListList();
   }
@@ -24,15 +23,6 @@ public class Picture {
     this.urls = Arrays.stream(urls).toList();
   }
 
-  public void downlaod()
-  {
-
-  }
-
-  public void downloadAsync()
-  {
-
-  }
 
   public static Picture Map(io.github.jwdeveloper.tiktok.messages.Image profilePicture)
   {

Client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java

@@ -44,4 +44,11 @@ public class TikTokEventObserver {
     public <T extends TikTokEvent> void unsubscribeAll(Class<?> clazz) {
         events.remove(clazz);
     }
+
+    public <T extends TikTokEvent> void unsubscribe(TikTokEventConsumer<T> consumer) {
+        for(var entry : events.entrySet())
+        {
+            entry.getValue().remove(consumer);
+        }
+    }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java

@@ -4,7 +4,6 @@ package io.github.jwdeveloper.tiktok.listener;
 import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
@@ -45,6 +44,13 @@ public class TikTokListenersManager implements ListenersManager {
         if (optional.isEmpty()) {
             return;
         }
+
+        var bindingModel =optional.get();
+
+        for(var consumer : bindingModel.getEvents())
+        {
+            eventObserver.unsubscribe(consumer);
+        }
         bindingModels.remove(optional.get());
     }
 
@@ -61,9 +67,9 @@ public class TikTokListenersManager implements ListenersManager {
         for (var method : methods)
         {
             var eventClazz = method.getParameterTypes()[1];
-            if(!eventClazz.isAssignableFrom(TikTokEvent.class))
+            if(eventClazz.isAssignableFrom(TikTokEvent.class) && !eventClazz.equals(TikTokEvent.class))
             {
-                throw new TikTokEventListenerMethodException("Method "+method.getName()+" 2nd parameter must instance of "+TikTokEvent.class.getName());
+                throw new TikTokEventListenerMethodException("Method "+method.getName()+"() 2nd parameter must instance of "+TikTokEvent.class.getName());
             }
             var tikTokEventConsumer = new TikTokEventConsumer() {
                 @Override

README.md

@@ -37,7 +37,7 @@ Do you prefer other programming languages?
 <dependency>
     <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
     <artifactId>Client</artifactId>
-    <version>0.0.14-Release</version>
+    <version>0.0.20-Release</version>
     <scope>compile</scope>
 </dependency>
 <dependency>
@@ -77,7 +77,7 @@ public class SimpleExample {
                 })
                 .onComment((client, event)  ->
                 {
-                    System.out.println(event.getUser().getUniqueId() + ": " + event.getText());
+                   System.out.println(event.getUser().getUniqueId() + ": " + event.getText());
                 })
                 .onEvent((client, event) ->
                 {
@@ -131,6 +131,7 @@ public class ConfigurationExample {
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent;
@@ -153,9 +154,17 @@ public class ListenerExample
         System.in.read();
     }
 
+    /*
+       Method in TikTokEventListener should meet 4 requirements to be detected
+        - must have @TikTokEventHandler annotation
+        - must have 2 parameters
+        - first parameter must be LiveClient
+        - second must be class that extending TikTokEvent
+     */
     public static class CustomListener implements TikTokEventListener
     {
 
+
         @TikTokEventHandler
         public void onError(LiveClient liveClient, TikTokErrorEvent event)
         {
@@ -173,6 +182,13 @@ public class ListenerExample
         {
             System.out.println(event.getGift().getDescription());
         }
+
+        @TikTokEventHandler
+        public void onAnyEvent(LiveClient liveClient, TikTokEvent event)
+        {
+            System.out.println(event.getClass().getSimpleName());
+        }
+
     }
 }
 

TestApplication/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java

@@ -1,6 +1,7 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent;
@@ -23,9 +24,17 @@ public class ListenerExample
         System.in.read();
     }
 
+    /*
+       Method in TikTokEventListener should meet 4 requirements to be detected
+        - must have @TikTokEventHandler annotation
+        - must have 2 parameters
+        - first parameter must be LiveClient
+        - second must be class that extending TikTokEvent
+     */
     public static class CustomListener implements TikTokEventListener
     {
 
+
         @TikTokEventHandler
         public void onError(LiveClient liveClient, TikTokErrorEvent event)
         {
@@ -43,5 +52,12 @@ public class ListenerExample
         {
             System.out.println(event.getGift().getDescription());
         }
+
+        @TikTokEventHandler
+        public void onAnyEvent(LiveClient liveClient, TikTokEvent event)
+        {
+            System.out.println(event.getClass().getSimpleName());
+        }
+
     }
 }

Tools-EventsCollector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Tools-ReadmeGenerator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Tools/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>0.0.15-Release</version>
+        <version>0.0.20-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.15-Release</version>
+    <version>0.0.20-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>