From a707103f9e60abb7a71a11c19d186aafdc51151a Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Tue, 30 Jul 2019 12:09:56 +0200 Subject: [PATCH] Add classpath scan for sync listeners --- pom.xml | 6 +++ .../server/project/sync/SyncListener.java | 5 +++ .../project/sync/ProjectSyncHandler.scala | 43 +++++++++---------- .../listener/design/DesignAddListener.scala | 2 + .../design/DesignUpdateListener.scala | 2 + .../sync/listener/pad/PadAddListener.scala | 2 + .../sync/listener/pad/PadClearListener.scala | 2 + .../sync/listener/pad/PadRemoveListener.scala | 2 + .../sync/listener/pad/PadUpdateListener.scala | 2 + .../pad/settings/PadSettingsAddListener.scala | 2 + .../settings/PadSettingsUpdateListener.scala | 2 + .../sync/listener/page/PageAddListener.scala | 2 + .../listener/page/PageRemoveListener.scala | 2 + .../listener/page/PageUpdateListener.scala | 2 + .../sync/listener/path/PathAddListener.scala | 2 + .../listener/path/PathRemoveListener.scala | 2 + .../listener/project/ProjectAddListener.scala | 2 + .../project/ProjectRemoveListener.scala | 2 + .../project/ProjectUpdateListener.scala | 2 + 19 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 src/main/java/de/tobias/playpad/server/server/project/sync/SyncListener.java diff --git a/pom.xml b/pom.xml index ebf1d79..a961df3 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 0000000..41fe379 --- /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 3b476a2..f3901ee 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 c9d8a29..cc38412 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 7051119..caf05f0 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 42c9fa1..79bbbd0 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 cb27b92..89d1ca4 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 3c2e49c..8c6cf3f 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 29a1202..860eac4 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 bb389e1..0e53a76 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 a1b9790..d23f15a 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 9d3ac3b..f2fee8f 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 81ffce2..a4497db 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 24c6234..45699b6 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 0d08ca2..60493fb 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 400c8ec..4bfe43f 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 8e237c5..bc0b81a 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 c2edae2..d11853b 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 9c6242e..8db8133 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) -- GitLab