Refactor Addon to avoid cyclic dependency

romanpbm · romanpbm · commit ae2a05aab54f · 2024-01-31T10:48:23.000+02:00
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/ExternalProcessInstance.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/ExternalProcessInstance.java
@@ -80,9 +80,10 @@ public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> ali
 		}, PERIODS_OF_HEALTH_CHECK_SECONDS, PERIODS_OF_HEALTH_CHECK_SECONDS, TimeUnit.SECONDS);
 	}
 
-	public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> aliasToState, ConcurrentMap<String, CompletableFuture<?>> aliasToInitializationTask, CompletableFuture<Integer> pythonExitCode, Connector connector) {
+	public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> aliasToState, ConcurrentMap<String, CompletableFuture<?>> aliasToInitializationTask, CompletableFuture<Integer> pythonExitCode, Connector connector, EventLoop eventLoop) {
 		this(scriptFile, aliasToState, aliasToInitializationTask, pythonExitCode);
 		this.connector = connector;
+		this.eventLoop = eventLoop;
 	}
 
 	@Override
@@ -118,7 +119,6 @@ public void run() {
 			}
 			Log.info("Processed started");
 			server.start();
-			eventLoop = new EventLoop();
 			IncomeConverterManager incomeConverterManager = DaggerIncomeConverterManagerFactory.create().incomeConverterManager();
 			OutcomeConverterManager outcomeConverterManager = DaggerOutcomeConverterManagerFactory.create().outcomeConverterManager();
 			SendingEventToClientHandler sendingEventToClientHandler = new SendingEventToClientHandler(outcomeConverterManager, server);
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/RpcServerAddon.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/RpcServerAddon.java
@@ -1,15 +1,18 @@
 package com.bookmap.api.rpc.server.addon;
 
 import com.bookmap.addons.broadcasting.api.view.BroadcasterConsumer;
+import com.bookmap.addons.broadcasting.api.view.listeners.ProviderStatusListener;
 import com.bookmap.addons.broadcasting.implementations.view.BroadcastFactory;
 import com.bookmap.api.rpc.server.*;
+import com.bookmap.api.rpc.server.addon.listeners.broadcasting.RpcProviderStatusListener;
 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.outcome.OnIntervalEvent;
 import com.bookmap.api.rpc.server.data.outcome.ServerOffEvent;
 import com.bookmap.api.rpc.server.exceptions.FatalServerException;
 import com.bookmap.api.rpc.server.log.PythonStackTraceTracker;
 import com.bookmap.api.rpc.server.log.RpcLogger;
+import com.bookmap.api.rpc.server.services.ProviderStatusService;
 import velox.api.layer1.Layer1ApiProvider;
 import velox.api.layer1.annotations.*;
 import velox.api.layer1.common.DirectoryResolver;
@@ -122,11 +125,16 @@ public void initialize(String alias, InstrumentInfo instrumentInfo, Api api, Ini
 			Layer1ApiProvider provider = api.getProvider();
 
 			ListenableHelper.addListeners(provider, this);
-			broadcaster = BroadcastFactory.getBroadcasterConsumer(provider, this.getClass().getSimpleName(), this.getClass());
+
+			EventLoop eventLoop = new EventLoop();
+			ProviderStatusService providerStatusService = new ProviderStatusService(eventLoop);
+			ProviderStatusListener providerStatusListener = new RpcProviderStatusListener(providerStatusService);
+			broadcaster = BroadcastFactory.getBroadcasterConsumer(provider, this.getClass().getSimpleName(), this.getClass(), providerStatusListener);
+			providerStatusService.setBroadcaster(broadcaster);
 			connector = new Connector(broadcaster);
 
 			if (instance == null) {
-				instance = new ExternalProcessInstance(SCRIPT_FILE, ALIAS_TO_STATE, ALIAS_TO_INITIALIZATION_TASK, pythonExitCode, connector);
+				instance = new ExternalProcessInstance(SCRIPT_FILE, ALIAS_TO_STATE, ALIAS_TO_INITIALIZATION_TASK, pythonExitCode, connector, eventLoop);
 				instance.run();
 			}
 			this.initialState.instrumentApi.addIntervalListeners(this);

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,10 @@ public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> ali`
`80`	`80`	`}, PERIODS_OF_HEALTH_CHECK_SECONDS, PERIODS_OF_HEALTH_CHECK_SECONDS, TimeUnit.SECONDS);`
`81`	`81`	`}`
`82`	`82`
`83`		`- public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> aliasToState, ConcurrentMap<String, CompletableFuture<?>> aliasToInitializationTask, CompletableFuture<Integer> pythonExitCode, Connector connector) {`
	`83`	`+ public ExternalProcessInstance(File scriptFile, ConcurrentMap<String, State> aliasToState, ConcurrentMap<String, CompletableFuture<?>> aliasToInitializationTask, CompletableFuture<Integer> pythonExitCode, Connector connector, EventLoop eventLoop) {`
`84`	`84`	`this(scriptFile, aliasToState, aliasToInitializationTask, pythonExitCode);`
`85`	`85`	`this.connector = connector;`
	`86`	`+ this.eventLoop = eventLoop;`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`@Override`
`@@ -118,7 +119,6 @@ public void run() {`
`118`	`119`	`}`
`119`	`120`	`Log.info("Processed started");`
`120`	`121`	`server.start();`
`121`		`- eventLoop = new EventLoop();`
`122`	`122`	`IncomeConverterManager incomeConverterManager = DaggerIncomeConverterManagerFactory.create().incomeConverterManager();`
`123`	`123`	`OutcomeConverterManager outcomeConverterManager = DaggerOutcomeConverterManagerFactory.create().outcomeConverterManager();`
`124`	`124`	`SendingEventToClientHandler sendingEventToClientHandler = new SendingEventToClientHandler(outcomeConverterManager, server);`