Split listeners package into different subpackages

romanpbm · romanpbm · commit 9caf2d19d5f3 · 2024-01-26T09:37:57.000+02:00
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
@@ -5,9 +5,9 @@
 import com.bookmap.addons.broadcasting.api.view.GeneratorInfo;
 
 import com.bookmap.api.rpc.server.EventLoop;
-import com.bookmap.api.rpc.server.addon.listeners.ConnectionListener;
-import com.bookmap.api.rpc.server.addon.listeners.EventListener;
-import com.bookmap.api.rpc.server.addon.listeners.LiveConnectionListener;
+import com.bookmap.api.rpc.server.addon.listeners.broadcasting.ConnectionListener;
+import com.bookmap.api.rpc.server.addon.listeners.broadcasting.EventListener;
+import com.bookmap.api.rpc.server.addon.listeners.broadcasting.LiveConnectionListener;
 import com.bookmap.api.rpc.server.log.RpcLogger;
 
 import java.util.List;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/ConnectionListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/ConnectionListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.broadcasting;
 
 import com.bookmap.addons.broadcasting.api.view.listeners.ConnectionStatusListener;
 
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
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.broadcasting;
 
 import com.bookmap.addons.broadcasting.api.view.listeners.LiveEventListener;
 import com.bookmap.api.rpc.server.EventLoop;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/LiveConnectionListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/LiveConnectionListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.broadcasting;
 
 import com.bookmap.addons.broadcasting.api.view.listeners.LiveConnectionStatusListener;
 
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcBarDataListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcBarDataListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.data;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.BarEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcDepthDataListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcDepthDataListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.data;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.DepthDataEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcMboDataListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/data/RpcMboDataListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.data;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.MboDataEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcBalanceListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcBalanceListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.trading;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.BalanceEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcOrderListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcOrderListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.trading;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.OrderExecutionEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcPositionListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcPositionListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.trading;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.PositionUpdateEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcTradeDataListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/trading/RpcTradeDataListener.java
@@ -1,4 +1,4 @@
-package com.bookmap.api.rpc.server.addon.listeners;
+package com.bookmap.api.rpc.server.addon.listeners.trading;
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.TradeDataEvent;
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/handlers/ReqDataHandler.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/handlers/ReqDataHandler.java
@@ -2,7 +2,13 @@
 
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.State;
-import com.bookmap.api.rpc.server.addon.listeners.*;
+import com.bookmap.api.rpc.server.addon.listeners.data.RpcBarDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.data.RpcDepthDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.data.RpcMboDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.trading.RpcBalanceListener;
+import com.bookmap.api.rpc.server.addon.listeners.trading.RpcOrderListener;
+import com.bookmap.api.rpc.server.addon.listeners.trading.RpcPositionListener;
+import com.bookmap.api.rpc.server.addon.listeners.trading.RpcTradeDataListener;
 import com.bookmap.api.rpc.server.data.income.ReqBarDataEvent;
 import com.bookmap.api.rpc.server.data.income.ReqDataEvent;
 import com.bookmap.api.rpc.server.data.outcome.ErrorEvent;
diff --git a/serverside-rpc/src/test/java/integrational/AddonVsPythonCommunicationSimulationTest.java b/serverside-rpc/src/test/java/integrational/AddonVsPythonCommunicationSimulationTest.java
@@ -2,9 +2,9 @@
 
 import com.bookmap.api.rpc.server.State;
 import com.bookmap.api.rpc.server.addon.TestInstance;
-import com.bookmap.api.rpc.server.addon.listeners.RpcDepthDataListener;
-import com.bookmap.api.rpc.server.addon.listeners.RpcMboDataListener;
-import com.bookmap.api.rpc.server.addon.listeners.RpcTradeDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.data.RpcDepthDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.data.RpcMboDataListener;
+import com.bookmap.api.rpc.server.addon.listeners.trading.RpcTradeDataListener;
 import com.bookmap.api.rpc.server.data.outcome.InstrumentDetachedEvent;
 import com.bookmap.api.rpc.server.data.outcome.InstrumentInfoEvent;
 import com.bookmap.api.rpc.server.data.utils.Type;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.bookmap.api.rpc.server.addon.listeners;`
	`1`	`+package com.bookmap.api.rpc.server.addon.listeners.broadcasting;`
`2`	`2`
`3`	`3`	`import com.bookmap.addons.broadcasting.api.view.listeners.ConnectionStatusListener;`
`4`	`4`