BookmapAPI · epns152 · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024 · Feb 22, 2024
diff --git a/client-rpc/src/bookmap/__init__.py b/client-rpc/src/bookmap/__init__.py
@@ -30,6 +30,7 @@
     add_on_position_update_handler,\
     add_broadcasting_handler, \
     add_broadcasting_provider_status_handler, \
+    add_broadcasting_settings_handler, \
     create_order_book, \
     on_depth, \
     get_bbo, \

diff --git a/client-rpc/src/bookmap/bookmap.py b/client-rpc/src/bookmap/bookmap.py
@@ -58,6 +58,7 @@
 BROADCASTING = "29"
 REGISTER_BROADCASTING_PROVIDER = "30"
 PROVIDERS_STATUS = "31"
+BROADCASTING_SETTINGS = "32"
 ERROR = "-1"
 
 counter_lock = threading.Lock()
@@ -285,6 +286,8 @@ def _get_parameters_from_msg(type_token: str, msg: str):
         return tokens[1], json.loads(tokens[2])
     elif type_token == PROVIDERS_STATUS:
         return [json.loads(tokens[1])]
+    elif type_token == BROADCASTING_SETTINGS:
+        return tokens[1], json.loads(tokens[2])
     else:
         # default case when there should not be any parameter parsing, but instead the msg should be sent to a server
         return type_token, msg
@@ -722,6 +725,13 @@ def add_broadcasting_provider_status_handler(
     _add_event_handler(addon, PROVIDERS_STATUS, handler)
 
 
+def add_broadcasting_settings_handler(
+        addon: typing.Dict[str, object],
+        handler: typing.Callable[[str, object], None]
+) -> None:
+    _add_event_handler(addon, BROADCASTING_SETTINGS, handler)
+
+
 ################ Util objects
 ### Order book
 def create_order_book() -> typing.Dict[str, SortedDict]:

diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/Connector.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/Connector.java
@@ -68,13 +68,14 @@ public void subscribeToLiveData(String generatorName, EventLoop eventLoop, Strin
 
                 // Trying to subscribe for live events.
                 // Broadcasting will notify us of a successful subscription through the LiveConnectionListener.
-                broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),
-                        Event.class, eventListener, subscriptionListener);
+
                 if (doesRequireFiltering) {
-                    broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener());
+                    broadcasterConsumer.setListenersForGenerator(providerName, generatorName, filterListener, new SettingsListener(eventLoop, generatorName));
                 } else {
                     broadcasterConsumer.setListenersForGenerator(providerName, generatorName, null, null);
                 }
+                broadcasterConsumer.subscribeToLiveData(providerName, generatorInfo.getGeneratorName(),
+                        Event.class, eventListener, subscriptionListener);
             });
         }
     }

diff --git a/.../src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java b/.../src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java
@@ -3,11 +3,7 @@
 import com.bookmap.addons.broadcasting.api.view.listeners.LiveEventListener;
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.BroadcastingEvent;
-import com.google.gson.JsonObject;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import com.bookmap.api.rpc.server.utils.JsonUtil;
 
 /**
  * The listener that is passed to BrAPI.
@@ -17,7 +13,6 @@ public class EventListener implements LiveEventListener {
 
     private final EventLoop eventLoop;
     private final String generatorName;
-    private final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();
     private final FilterListener filterListener;
 
     public EventListener(EventLoop eventLoop, String generatorName, FilterListener filterListener) {
@@ -34,43 +29,12 @@ public void giveEvent(Object o) {
             }
             String event;
             try {
-                event = convertEventToJSON(o);
+                event = JsonUtil.convertObjectToJsonString(o);
             }
             catch (IllegalAccessException e) {
                 throw new RuntimeException("Error during parsing event object", e);
             }
             eventLoop.pushEvent(new BroadcastingEvent(generatorName, event));
         }
     }
-
-    private String convertEventToJSON(Object o) throws IllegalAccessException {
-        JsonObject jsonObject = new JsonObject();
-        Class<?> clazz = o.getClass();
-        if (classToFields.containsKey(clazz)) {
-            Field[] fields = classToFields.get(clazz);
-            for (Field field : fields) {
-                field.setAccessible(true);
-                String fieldName = field.getName();
-                Object fieldValue = field.get(o);
-                jsonObject.addProperty(fieldName, fieldValue.toString());
-            }
-        } else {
-            Field[] fields = clazz.getDeclaredFields();
-            List<Field> fieldNames = new ArrayList<>();
-            for (Field field : fields) {
-                field.setAccessible(true);
-
-                String fieldName = field.getName();
-                if (fieldName.equals("serialVersionUID")) {
-                    continue;
-                }
-                fieldNames.add(field);
-                Object fieldValue = field.get(o);
-                jsonObject.addProperty(fieldName, fieldValue.toString());
-            }
-            classToFields.put(clazz, fieldNames.toArray(new Field[0]));
-        }
-
-        return jsonObject.toString();
-    }
 }
diff --git a/...c/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/SettingsListener.java b/...c/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/SettingsListener.java
@@ -1,9 +1,31 @@
 package com.bookmap.api.rpc.server.addon.listeners.broadcasting;
 
 import com.bookmap.addons.broadcasting.api.view.listeners.UpdateSettingsListener;
+import com.bookmap.api.rpc.server.EventLoop;
+import com.bookmap.api.rpc.server.data.outcome.BroadcastingSettingsEvent;
+import com.bookmap.api.rpc.server.utils.JsonUtil;
 
 public class SettingsListener implements UpdateSettingsListener {
+
+    private final EventLoop eventLoop;
+    private final String generatorName;
+
+    public SettingsListener(EventLoop eventLoop, String generatorName) {
+        this.eventLoop = eventLoop;
+        this.generatorName = generatorName;
+    }
+
     @Override
     public void reactToSettingsUpdate(Object o) {
+        if (o != null) {
+            String event;
+            try {
+                event = JsonUtil.convertObjectToJsonString(o);
+            }
+            catch (IllegalAccessException e) {
+                throw new RuntimeException("Error during parsing event object", e);
+            }
+            eventLoop.pushEvent(new BroadcastingSettingsEvent(generatorName, event));
+        }
     }
 }
diff --git a/...-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/BroadcastingSettingsEvent.java b/...-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/BroadcastingSettingsEvent.java
@@ -0,0 +1,16 @@
+package com.bookmap.api.rpc.server.data.outcome;
+
+import com.bookmap.api.rpc.server.data.utils.AbstractEvent;
+import com.bookmap.api.rpc.server.data.utils.Type;
+
+public class BroadcastingSettingsEvent extends AbstractEvent {
+
+    public final String event;
+    public final String generatorName;
+
+    public BroadcastingSettingsEvent(String generatorName, String event) {
+        super(Type.BROADCASTING_SETTINGS);
+        this.generatorName = generatorName;
+        this.event = event;
+    }
+}
diff --git a/...ava/com/bookmap/api/rpc/server/data/outcome/converters/BroadcastingSettingsConverter.java b/...ava/com/bookmap/api/rpc/server/data/outcome/converters/BroadcastingSettingsConverter.java
@@ -0,0 +1,22 @@
+package com.bookmap.api.rpc.server.data.outcome.converters;
+
+import com.bookmap.api.rpc.server.data.outcome.BroadcastingSettingsEvent;
+import com.bookmap.api.rpc.server.data.utils.EventConverter;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class BroadcastingSettingsConverter implements EventConverter<BroadcastingSettingsEvent, String> {
+    @Inject
+    BroadcastingSettingsConverter() {}
+
+    @Override
+    public String convert(BroadcastingSettingsEvent entity) {
+        return entity.type.code +
+                FIELDS_DELIMITER +
+                entity.generatorName +
+                FIELDS_DELIMITER +
+                entity.event;
+    }
+}
diff --git a/...p/api/rpc/server/data/outcome/converters/modules/BroadcastingSettingsConverterModule.java b/...p/api/rpc/server/data/outcome/converters/modules/BroadcastingSettingsConverterModule.java
@@ -0,0 +1,19 @@
+package com.bookmap.api.rpc.server.data.outcome.converters.modules;
+
+import com.bookmap.api.rpc.server.data.outcome.converters.BroadcastingSettingsConverter;
+import com.bookmap.api.rpc.server.data.utils.AbstractEvent;
+import com.bookmap.api.rpc.server.data.utils.EventConverter;
+import com.bookmap.api.rpc.server.data.utils.EventTypeMapKey;
+import com.bookmap.api.rpc.server.data.utils.Type;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class BroadcastingSettingsConverterModule {
+
+    @Binds
+    @IntoMap
+    @EventTypeMapKey(Type.BROADCASTING_SETTINGS)
+    abstract EventConverter<? extends AbstractEvent, String> converter(BroadcastingSettingsConverter converter);
+}
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/utils/Type.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/utils/Type.java
@@ -42,6 +42,7 @@ public enum Type {
 	BROADCASTING(29),
 	REGISTER_BROADCASTING_PROVIDER(30),
 	PROVIDERS_STATUS(31),
+	BROADCASTING_SETTINGS(32),
 	ERROR(-1),
 	UNKNOWN(-2147483648);
 

diff --git a/...in/java/com/bookmap/api/rpc/server/data/utils/modules/OutcomeConverterManagerFactory.java b/...in/java/com/bookmap/api/rpc/server/data/utils/modules/OutcomeConverterManagerFactory.java
@@ -11,6 +11,7 @@
 		modules = {
 				BalanceConverterModule.class,
 				BroadcastingConverterModule.class,
+				BroadcastingSettingsConverterModule.class,
 				DepthDataConverterModule.class,
 				ErrorEventConverterModule.class,
 				IndicatorResponseConverterModule.class,

diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/utils/JsonUtil.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/utils/JsonUtil.java
@@ -0,0 +1,44 @@
+package com.bookmap.api.rpc.server.utils;
+
+import com.google.gson.JsonObject;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class JsonUtil {
+    private static final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();
+
+    public static String convertObjectToJsonString(Object o) throws IllegalAccessException {
+        JsonObject jsonObject = new JsonObject();
+        Class<?> clazz = o.getClass();
+        if (classToFields.containsKey(clazz)) {
+            Field[] fields = classToFields.get(clazz);
+            for (Field field : fields) {
+                field.setAccessible(true);
+                String fieldName = field.getName();
+                Object fieldValue = field.get(o);
+                jsonObject.addProperty(fieldName, fieldValue.toString());
+            }
+        } else {
+            Field[] fields = clazz.getDeclaredFields();
+            List<Field> fieldNames = new ArrayList<>();
+            for (Field field : fields) {
+                field.setAccessible(true);
+
+                String fieldName = field.getName();
+                if (fieldName.equals("serialVersionUID")) {
+                    continue;
+                }
+                fieldNames.add(field);
+                Object fieldValue = field.get(o);
+                jsonObject.addProperty(fieldName, fieldValue.toString());
+            }
+            classToFields.put(clazz, fieldNames.toArray(new Field[0]));
+        }
+
+        return jsonObject.toString();
+    }
+}
diff --git a/serverside-rpc/src/main/resources/bookmap/__init__.py b/serverside-rpc/src/main/resources/bookmap/__init__.py
@@ -30,6 +30,7 @@
     add_on_position_update_handler,\
     add_broadcasting_handler, \
     add_broadcasting_provider_status_handler, \
+    add_broadcasting_settings_handler, \
     create_order_book, \
     on_depth, \
     get_bbo, \

diff --git a/serverside-rpc/src/main/resources/bookmap/bookmap.py b/serverside-rpc/src/main/resources/bookmap/bookmap.py
@@ -58,6 +58,7 @@
 BROADCASTING = "29"
 REGISTER_BROADCASTING_PROVIDER = "30"
 PROVIDERS_STATUS = "31"
+BROADCASTING_SETTINGS = "32"
 ERROR = "-1"
 
 counter_lock = threading.Lock()
@@ -285,6 +286,8 @@ def _get_parameters_from_msg(type_token: str, msg: str):
         return tokens[1], json.loads(tokens[2])
     elif type_token == PROVIDERS_STATUS:
         return [json.loads(tokens[1])]
+    elif type_token == BROADCASTING_SETTINGS:
+        return tokens[1], json.loads(tokens[2])
     else:
         # default case when there should not be any parameter parsing, but instead the msg should be sent to a server
         return type_token, msg
@@ -722,6 +725,13 @@ def add_broadcasting_provider_status_handler(
     _add_event_handler(addon, PROVIDERS_STATUS, handler)
 
 
+def add_broadcasting_settings_handler(
+        addon: typing.Dict[str, object],
+        handler: typing.Callable[[str, object], None]
+) -> None:
+    _add_event_handler(addon, BROADCASTING_SETTINGS, handler)
+
+
 ################ Util objects
 ### Order book
 def create_order_book() -> typing.Dict[str, SortedDict]: