Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Code cleanup in observer handler code

This commit is contained in:
Robert von Burg 2022-06-30 20:43:07 +02:00
parent 1e114c1ab2
commit 984c30fe14
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
View File

@ -23,15 +23,14 @@ import java.util.List;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import li.strolch.agent.api.*; import li.strolch.agent.api.*;
import li.strolch.model.log.LogMessage;
import li.strolch.model.log.LogMessageState;
import li.strolch.model.log.LogSeverity;
import li.strolch.handler.operationslog.OperationsLog; import li.strolch.handler.operationslog.OperationsLog;
import li.strolch.model.Locator; import li.strolch.model.Locator;
import li.strolch.model.StrolchRootElement; import li.strolch.model.StrolchRootElement;
import li.strolch.model.log.LogMessage;
import li.strolch.model.log.LogMessageState;
import li.strolch.model.log.LogSeverity;
import li.strolch.utils.collections.MapOfLists; import li.strolch.utils.collections.MapOfLists;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -48,8 +47,7 @@ public class DefaultObserverHandler implements ObserverHandler {
private final StrolchAgent agent; private final StrolchAgent agent;
private final StrolchRealm realm; private final StrolchRealm realm;
private MapOfLists<String, Observer> observerMap; private final MapOfLists<String, Observer> observerMap;
private Future<?> future;
public DefaultObserverHandler(StrolchAgent agent, StrolchRealm realm) { public DefaultObserverHandler(StrolchAgent agent, StrolchRealm realm) {
this.agent = agent; this.agent = agent;
@ -64,26 +62,17 @@ public class DefaultObserverHandler implements ObserverHandler {
@Override @Override
public void stop() { public void stop() {
// nothing to do
if (this.future != null) {
this.future.cancel(false);
this.future = null;
}
}
private ScheduledExecutorService getExecutor() {
return this.agent.getScheduledExecutor("Observer");
} }
@Override @Override
public void notify(ObserverEvent event) { public void notify(ObserverEvent event) {
if (event.added.isEmpty() && event.updated.isEmpty() && event.removed.isEmpty()) if (event.added.isEmpty() && event.updated.isEmpty() && event.removed.isEmpty())
return; return;
ExecutorService service = this.agent.getExecutor("Observer"); ExecutorService service = this.agent.getExecutor("Observer");
if (!service.isShutdown()) if (!service.isShutdown())
this.future = service.submit(() -> doUpdates(event)); service.submit(() -> doUpdates(event));
} }
protected void doUpdates(ObserverEvent event) { protected void doUpdates(ObserverEvent event) {

4
li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
View File

@ -47,10 +47,6 @@ public class DefaultRealmHandler extends StrolchComponent implements RealmHandle
protected Map<String, InternalStrolchRealm> realms; protected Map<String, InternalStrolchRealm> realms;
/**
* @param container
* @param componentName
*/
public DefaultRealmHandler(ComponentContainer container, String componentName) { public DefaultRealmHandler(ComponentContainer container, String componentName) {
super(container, componentName); super(container, componentName);
} }

5
li.strolch.agent/src/main/java/li/strolch/agent/impl/EventCollectingObserverHandler.java
View File

@ -46,12 +46,12 @@ public class EventCollectingObserverHandler implements ObserverHandler {
private static final Logger logger = LoggerFactory.getLogger(DefaultObserverHandler.class); private static final Logger logger = LoggerFactory.getLogger(DefaultObserverHandler.class);
private MapOfLists<String, Observer> observerMap; private final MapOfLists<String, Observer> observerMap;
private ObserverEvent observerEvent; private ObserverEvent observerEvent;
private ScheduledFuture<?> future; private ScheduledFuture<?> future;
private StrolchAgent agent; private final StrolchAgent agent;
private final StrolchRealm realm; private final StrolchRealm realm;
public EventCollectingObserverHandler(StrolchAgent agent, StrolchRealm realm) { public EventCollectingObserverHandler(StrolchAgent agent, StrolchRealm realm) {
@ -67,7 +67,6 @@ public class EventCollectingObserverHandler implements ObserverHandler {
@Override @Override
public void stop() { public void stop() {
if (this.future != null) { if (this.future != null) {
this.future.cancel(false); this.future.cancel(false);
this.future = null; this.future = null;