Rename field alias to generatorName

romanpbm · romanpbm · commit 78a26e8d195e · 2024-01-31T10:44:30.000+02:00
This is done to maintain domain names. It was called "alias" because of lack of knowledge (generators in Absorption are called the same as aliases)
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
@@ -55,33 +55,33 @@ public boolean isConnected(){
     }
 
 
-    public void subscribeToLiveData(String alias, EventLoop eventLoop, String providerName) {
+    public void subscribeToLiveData(String generatorName, EventLoop eventLoop, String providerName) {
         if (isConnected()) {
-            Optional<GeneratorInfo> generatorInfoOptional = getGeneratorInfo(alias, providerName);
+            Optional<GeneratorInfo> generatorInfoOptional = getGeneratorInfo(generatorName, providerName);
             generatorInfoOptional.ifPresent(generatorInfo -> {
                 LiveConnectionListener subscriptionListener =
-                        liveSubscriptionListenersByAlias.computeIfAbsent(alias, listener ->
+                        liveSubscriptionListenersByAlias.computeIfAbsent(generatorName, listener ->
                                 new LiveConnectionListener());
 
                 // Creating a listener for the events themselves.
-                EventListener eventListener = new EventListener(eventLoop, alias);
+                EventListener eventListener = new EventListener(eventLoop, generatorName);
 
                 // 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);
-                broadcasterConsumer.setListenersForGenerator(providerName, alias, null, null);
+                broadcasterConsumer.setListenersForGenerator(providerName, generatorName, null, null);
             });
         }
     }
 
-    private Optional<GeneratorInfo> getGeneratorInfo(String alias, String providerName) {
+    private Optional<GeneratorInfo> getGeneratorInfo(String generatorName, String providerName) {
         GeneratorInfo generatorInfo = null;
         List<GeneratorInfo> generatorsInfo = broadcasterConsumer.getGeneratorsInfo(providerName);
         for (GeneratorInfo generator : generatorsInfo) {
             // In AbsorptionIndicator, generators have the names of the aliases they work with.
             // Therefore, according to the alias, we will get a suitable generator for us.
-            if (generator.getGeneratorName().equals(alias)) {
+            if (generator.getGeneratorName().equals(generatorName)) {
                 generatorInfo = generator;
                 break;
             }
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java
@@ -17,12 +17,12 @@
 public class EventListener implements LiveEventListener {
 
     private final EventLoop eventLoop;
-    private final String alias;
+    private final String generatorName;
     private final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();
 
-    public EventListener(EventLoop eventLoop, String alias) {
+    public EventListener(EventLoop eventLoop, String generatorName) {
         this.eventLoop = eventLoop;
-        this.alias = alias;
+        this.generatorName = generatorName;
     }
 
     @Override
@@ -35,7 +35,7 @@ public void giveEvent(Object o) {
             catch (IllegalAccessException e) {
                 throw new RuntimeException("Error during parsing event object", e);
             }
-            eventLoop.pushEvent(new BroadcastingEvent(Type.BROADCASTING, alias, event));
+            eventLoop.pushEvent(new BroadcastingEvent(generatorName, event));
         }
     }
 
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/BroadcastingEvent.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/BroadcastingEvent.java
@@ -1,12 +1,15 @@
 package com.bookmap.api.rpc.server.data.outcome;
 
-import com.bookmap.api.rpc.server.data.utils.AbstractEventWithAlias;
+import com.bookmap.api.rpc.server.data.utils.AbstractEvent;
 import com.bookmap.api.rpc.server.data.utils.Type;
 
-public class BroadcastingEvent extends AbstractEventWithAlias {
+public class BroadcastingEvent extends AbstractEvent {
     public final String event;
-    public BroadcastingEvent(Type type, String alias, String event) {
-        super(type, alias);
+    public final String generatorName;
+
+    public BroadcastingEvent(String generatorName, String event) {
+        super(Type.BROADCASTING);
+        this.generatorName = generatorName;
         this.event = event;
     }
 }
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/converters/BroadcastingConverter.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/data/outcome/converters/BroadcastingConverter.java
@@ -15,7 +15,7 @@ public class BroadcastingConverter implements EventConverter<BroadcastingEvent,
     public String convert(BroadcastingEvent entity) {
         return entity.type.code +
                 FIELDS_DELIMITER +
-                entity.alias +
+                entity.generatorName +
                 FIELDS_DELIMITER +
                 entity.event;
     }

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@`
`17`	`17`	`public class EventListener implements LiveEventListener {`
`18`	`18`
`19`	`19`	`private final EventLoop eventLoop;`
`20`		`- private final String alias;`
	`20`	`+ private final String generatorName;`
`21`	`21`	`private final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();`
`22`	`22`
`23`		`- public EventListener(EventLoop eventLoop, String alias) {`
	`23`	`+ public EventListener(EventLoop eventLoop, String generatorName) {`
`24`	`24`	`this.eventLoop = eventLoop;`
`25`		`- this.alias = alias;`
	`25`	`+ this.generatorName = generatorName;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`@@ -35,7 +35,7 @@ public void giveEvent(Object o) {`
`35`	`35`	`catch (IllegalAccessException e) {`
`36`	`36`	`throw new RuntimeException("Error during parsing event object", e);`
`37`	`37`	`}`
`38`		`- eventLoop.pushEvent(new BroadcastingEvent(Type.BROADCASTING, alias, event));`
	`38`	`+ eventLoop.pushEvent(new BroadcastingEvent(generatorName, event));`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class BroadcastingConverter implements EventConverter<BroadcastingEvent,`
`15`	`15`	`public String convert(BroadcastingEvent entity) {`
`16`	`16`	`return entity.type.code +`
`17`	`17`	`FIELDS_DELIMITER +`
`18`		`- entity.alias +`
	`18`	`+ entity.generatorName +`
`19`	`19`	`FIELDS_DELIMITER +`
`20`	`20`	`entity.event;`
`21`	`21`	`}`