diff --git a/pom.xml b/pom.xml
index ebf1d796919c12e819c858fb2380cfedea53daf0..a961df36ef58589da8ad0ba9ad48907817adb521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,12 @@
<version>${scala-library.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.github.classgraph</groupId>
+ <artifactId>classgraph</artifactId>
+ <version>4.8.43</version>
+ </dependency>
+
<dependency>
<groupId>de.thecodelabs</groupId>
<artifactId>libUtils</artifactId>
diff --git a/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java b/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..41fe379763d966791befc2b93323c7d021db8eba
--- /dev/null
+++ b/src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java
@@ -0,0 +1,5 @@
+package de.tobias.playpad.server.server.project.sync;
+
+public @interface SyncListener {
+ String value();
+}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index 3b476a2987c944c19460b59ddda29f595191c3cd..f3901eee9e6141a68ae99efcf766cd9ccb76a37f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -9,15 +9,18 @@ import de.tobias.playpad.server.account
import de.tobias.playpad.server.account.Account
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.listener.Listener
import de.tobias.playpad.server.server.project.sync.listener.design.{DesignAddListener, DesignUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.pad.settings.{PadSettingsAddListener, PadSettingsUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.pad.{PadAddListener, PadClearListener, PadRemoveListener, PadUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.page.{PageAddListener, PageRemoveListener, PageUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.path.{PathAddListener, PathRemoveListener}
import de.tobias.playpad.server.server.project.sync.listener.project.{ProjectAddListener, ProjectRemoveListener, ProjectUpdateListener}
+import io.github.classgraph.ClassGraph
import org.eclipse.jetty.websocket.api.Session
import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocketConnect, OnWebSocketMessage, WebSocket}
+import scala.jdk.CollectionConverters._
import scala.collection.{Map, mutable}
/**
@@ -30,29 +33,23 @@ import scala.collection.{Map, mutable}
// TODO mutable.HashSet --> Set
private var sessions: Map[Account, mutable.HashSet[Session]] = new mutable.HashMap[Account, mutable.HashSet[Session]]()
- private val listeners = Map(
- "pro-add" -> new ProjectAddListener(),
- "pro-update" -> new ProjectUpdateListener(),
- "pro-rm" -> new ProjectRemoveListener(),
-
- "page-add" -> new PageAddListener(),
- "page-update" -> new PageUpdateListener(),
- "page-rm" -> new PageRemoveListener(),
-
- "pad-add" -> new PadAddListener(),
- "pad-update" -> new PadUpdateListener(),
- "pad-rm" -> new PadRemoveListener(),
- "pad-clear" -> new PadClearListener(),
-
- "path-add" -> new PathAddListener(),
- "path-rm" -> new PathRemoveListener(),
-
- "design-add" -> new DesignAddListener(),
- "design-update" -> new DesignUpdateListener(),
-
- "pad-settings-add" -> new PadSettingsAddListener(),
- "pad-settings-update" -> new PadSettingsUpdateListener()
- )
+ private val listeners = {
+ val packageName = "de.tobias.playpad.server.server.project.sync.listener"
+ val scanResult = new ClassGraph()
+ .enableAllInfo()
+ .whitelistPackages(packageName)
+ .scan()
+
+ val annotationName = "de.tobias.playpad.server.server.project.sync.SyncListener"
+ scanResult.getClassesWithAnnotation(annotationName)
+ .asScala
+ .map(annotation => {
+ val info = annotation.getAnnotationInfo(annotationName)
+ val value = info.getParameterValues.getValue("value")
+ val instance = annotation.loadClass().newInstance().asInstanceOf[Listener]
+ value -> instance
+ }).toMap
+ }
@OnWebSocketConnect def onConnect(serverSession: Session): Unit = {
val key = serverSession.getUpgradeRequest.getHeader(SESSION_KEY_HEADER)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
index c9d8a29818bb6b6191bbc741c2afcb2a703fd02a..cc38412a220024a06252523bff5dc4458b80b9c8 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("design-add")
class DesignAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
index 7051119f21d2ee2b296a249304df988ff48b1714..caf05f0eebb58c36f5b48f1e1c60c8fa143e22be 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef._
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("design-update")
class DesignUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
index 42c9fa13c98107a251901b1a2fb31904ce8e829a..79bbbd04c3c4afb3d5d20bdeec2a2ddeddcbd434 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadAddListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pad-add")
class PadAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val padId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
index cb27b921454b6f1ec47391828e8de2620eafe49f..89d1ca4a3b882002c12e37648d2636d1328a9818 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadClearListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pad-clear")
class PadClearListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
index 3c2e49c9f4291f72f0c660c973548e557e45a763..8c6cf3fd6ee1ce49cb2782c70dd4575e3879cd78 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadRemoveListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pad-rm")
class PadRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
index 29a12023dae12c8152acf4fdf5dc54b1b66083b0..860eac40eb83b7a8da7c2cafcabb75751bf1e312 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/PadUpdateListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pad-update")
class PadUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val padID = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
index bb389e10916db0ce6de3a25bb6844815b6a09aed..0e53a76a404cd81ce330cd279b84a5b97a7c0eb1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsAddListener.scala
@@ -7,8 +7,10 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+@SyncListener("pad-settings-add")
class PadSettingsAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val padSettingsId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
index a1b9790a0d6f553c6b1d0fba57509aa8b3edfe50..d23f15af3c9f25c50b3b213c19441a1d1126f931 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/pad/settings/PadSettingsUpdateListener.scala
@@ -7,8 +7,10 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
+@SyncListener("pad-settings-update")
class PadSettingsUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val settingsId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
index 9d3ac3bbd6940a953a4bbe828d2b052482d71f66..f2fee8fc674cd01bcb234e19deb36e538d4d4cb3 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageAddListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("page-add")
class PageAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
index 81ffce2d20056e5de970b34e7299c63f0b7db611..a4497db638203a8885e0b9bfee1d8bb8d4a9c42f 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageRemoveListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("page-rm")
class PageRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
index 24c6234fce03d306b5c2c16ad24233abff06d7be..45699b6d8fe5c051e3c7f7bda5007ec2ead6f2af 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/page/PageUpdateListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("page-update")
class PageUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
index 0d08ca24542dbb7ac9ba84ea0c4e69d372b02ff8..60493fbed95c724f763bd02ee77a8859b60de1e1 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("path-add")
class PathAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pathId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
index 400c8ecbcb8a0d9eaf46bc424cccf9e0a6d6fc1f..4bfe43f580b662afe37215b79349e2db439d3d8b 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathRemoveListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("path-rm")
class PathRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val pageId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
index 8e237c5e2deb541a06e1bda3ae808d42e6a92263..bc0b81a124fe8a0635be7e7abb059b0b72689f76 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectAddListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pro-add")
class ProjectAddListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
index c2edae2943ea860f49590d851956e134786ff090..d11853b3ac1a91fe5c1afbbfb0a0a417bbfffbbd 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pro-rm")
class ProjectRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
index 9c6242ed8bcccfe9a11e9635249dfe0dbe162bc2..8db813322f8abe8d3413f12c205fcea92d145960 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectUpdateListener.scala
@@ -7,11 +7,13 @@ import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.SyncListener
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
+@SyncListener("pro-update")
class ProjectUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val projectId = UUID.fromString(json.get("id").getAsString)