Add flag for filtering in SubscribeToIndicatorEvent

romanpbm · romanpbm · commit a8a859c321fe · 2024-02-02T11:24:05.000+02:00
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/income/SubscribeToIndicatorEvent.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/income/SubscribeToIndicatorEvent.java
@@ -6,9 +6,11 @@
 public class SubscribeToIndicatorEvent extends AbstractEventWithAlias {
 
     public final String addonName;
+    public final boolean doesRequireFiltering;
 
-    public SubscribeToIndicatorEvent(String addonName, String alias) {
+    public SubscribeToIndicatorEvent(String addonName, String alias, boolean doesRequireFiltering) {
         super(Type.REGISTER_BROADCASTING_PROVIDER, alias);
         this.addonName = addonName;
+        this.doesRequireFiltering = doesRequireFiltering;
     }
 }
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/income/converters/SubscribeToIndicatorConverter.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/income/converters/SubscribeToIndicatorConverter.java
@@ -18,6 +18,6 @@ public class SubscribeToIndicatorConverter implements EventConverter<String, Abs
     @Override
     public SubscribeToIndicatorEvent convert(String entity) {
         String[] tokens = entity.split(FIELDS_DELIMITER);
-        return new SubscribeToIndicatorEvent(tokens[1], tokens[2]);
+        return new SubscribeToIndicatorEvent(tokens[1], tokens[2], Boolean.getBoolean(tokens[3]));
     }
 }
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/handlers/SubscribeToIndicatorHandler.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/handlers/SubscribeToIndicatorHandler.java
@@ -24,7 +24,7 @@ public void handle(SubscribeToIndicatorEvent event) {
         service.execute(() -> {
             try {
                 if (isConnected.get()) {
-                    connector.subscribeToLiveData(event.alias, eventLoop, event.addonName);
+                    connector.subscribeToLiveData(event.alias, eventLoop, event.addonName, event.doesRequireFiltering);
                     RpcLogger.info("Successfully connected to " + event.addonName + " " + event.alias);
                 }
             } catch (InterruptedException | ExecutionException e) {

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@`
`6`	`6`	`public class SubscribeToIndicatorEvent extends AbstractEventWithAlias {`
`7`	`7`
`8`	`8`	`public final String addonName;`
	`9`	`+ public final boolean doesRequireFiltering;`
`9`	`10`
`10`		`- public SubscribeToIndicatorEvent(String addonName, String alias) {`
	`11`	`+ public SubscribeToIndicatorEvent(String addonName, String alias, boolean doesRequireFiltering) {`
`11`	`12`	`super(Type.REGISTER_BROADCASTING_PROVIDER, alias);`
`12`	`13`	`this.addonName = addonName;`
	`14`	`+ this.doesRequireFiltering = doesRequireFiltering;`
`13`	`15`	`}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public class SubscribeToIndicatorConverter implements EventConverter<String, Abs`
`18`	`18`	`@Override`
`19`	`19`	`public SubscribeToIndicatorEvent convert(String entity) {`
`20`	`20`	`String[] tokens = entity.split(FIELDS_DELIMITER);`
`21`		`- return new SubscribeToIndicatorEvent(tokens[1], tokens[2]);`
	`21`	`+ return new SubscribeToIndicatorEvent(tokens[1], tokens[2], Boolean.getBoolean(tokens[3]));`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void handle(SubscribeToIndicatorEvent event) {`
`24`	`24`	`service.execute(() -> {`
`25`	`25`	`try {`
`26`	`26`	`if (isConnected.get()) {`
`27`		`- connector.subscribeToLiveData(event.alias, eventLoop, event.addonName);`
	`27`	`+ connector.subscribeToLiveData(event.alias, eventLoop, event.addonName, event.doesRequireFiltering);`
`28`	`28`	`RpcLogger.info("Successfully connected to " + event.addonName + " " + event.alias);`
`29`	`29`	`}`
`30`	`30`	`} catch (InterruptedException \| ExecutionException e) {`