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

[New] ExecutionHandler.addForExecution() now returns the controller

This commit is contained in:
Robert von Burg 2023-10-30 12:03:37 +01:00
parent 256ab666b3
commit e80d0a7944
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
View File

@ -1,15 +1,5 @@
package li.strolch.execution;
import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static li.strolch.model.StrolchModelConstants.*;
import static li.strolch.runtime.StrolchConstants.SYSTEM_USER_AGENT;
import static li.strolch.utils.collections.SynchronizedCollections.synchronizedMapOfMaps;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.ObserverEvent;
import li.strolch.agent.api.StrolchRealm;
@ -28,6 +18,16 @@ import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.utils.collections.MapOfMaps;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static li.strolch.model.StrolchModelConstants.*;
import static li.strolch.runtime.StrolchConstants.SYSTEM_USER_AGENT;
import static li.strolch.utils.collections.SynchronizedCollections.synchronizedMapOfMaps;
/**
* The event based execution handler waits for events in that the {@link ExecutionPolicy} implementations must call the
* relevant methods when the work is complete. Afterwards the next {@link Action} in the procedure is executed
@ -51,12 +51,12 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
@Override
public boolean isControlling(Activity activity) {
return this.controllers.containsElement(getDefaultRealm(), activity.getLocator());
return this.controllers.containsElement(getDefaultRealm(), activity.getRootElement().getLocator());
}
@Override
public boolean isControlling(String realm, Activity activity) {
return this.controllers.containsElement(realm, activity.getLocator());
return this.controllers.containsElement(realm, activity.getRootElement().getLocator());
}
@Override
@ -83,12 +83,12 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
@Override
public Controller getController(Activity activity) {
return getController(getDefaultRealm(), activity.getLocator());
return getController(getDefaultRealm(), activity.getRootElement().getLocator());
}
@Override
public Controller getController(String realm, Activity activity) {
return this.controllers.getElement(realm, activity.getLocator());
return this.controllers.getElement(realm, activity.getRootElement().getLocator());
}
@Override
@ -171,26 +171,28 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
}
@Override
public void addForExecution(Activity activity) {
addForExecution(getDefaultRealm(), activity);
public Controller addForExecution(Activity activity) {
return addForExecution(getDefaultRealm(), activity);
}
@Override
public void addForExecution(String realm, Activity activity) {
public Controller addForExecution(String realm, Activity activity) {
ExecutionHandlerState state = this.statesByRealm.getOrDefault(realm, ExecutionHandlerState.Running);
if (state == ExecutionHandlerState.HaltNew)
throw new IllegalStateException(
"ExecutionHandler state is " + state + ", can not add activities for execution!");
if (this.controllers.containsElement(realm, activity.getLocator()))
throw new IllegalStateException(activity.getLocator() + " is already registered for execution!");
Locator locator = activity.getRootElement().getLocator();
if (this.controllers.containsElement(realm, locator))
throw new IllegalStateException(locator + " is already registered for execution!");
logger.info("Added " + activity.getLocator() + " @ " + realm);
logger.info("Added " + locator + " @ " + realm);
Controller controller = newController(realm, activity);
this.controllers.addElement(realm, activity.getLocator(), controller);
this.controllers.addElement(realm, locator, controller);
notifyObserverAdd(controller);
triggerExecution(realm);
return controller;
}
@Override
@ -205,10 +207,11 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
throw new IllegalStateException(
"ExecutionHandler state is " + state + ", can not add activities for execution!");
Controller controller = this.controllers.getElement(realm, activity.getLocator());
Locator locator = activity.getRootElement().getLocator();
Controller controller = this.controllers.getElement(realm, locator);
if (controller == null) {
controller = newController(realm, activity);
this.controllers.addElement(realm, activity.getLocator(), controller);
this.controllers.addElement(realm, locator, controller);
notifyObserverAdd(controller);
}
@ -296,7 +299,8 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
if (activity.isReadOnly())
activity = activity.getClone(true);
logger.info("Restarting Execution of " + activity.getLocator() + " on realm " + realmName);
Locator locator = activity.getRootElement().getLocator();
logger.info("Restarting Execution of " + locator + " on realm " + realmName);
// in execution actions need to be in state STOPPED to restart
activity.findActionsDeep(a -> a.getState().inExecutionPhase()).forEach(a -> {
@ -309,7 +313,7 @@ public class EventBasedExecutionHandler extends ExecutionHandler {
// register for execution
Controller controller = newController(realmName, activity);
this.controllers.addElement(realmName, activity.getLocator(), controller);
this.controllers.addElement(realmName, locator, controller);
});
// commit changes to state

4
service/src/main/java/li/strolch/execution/ExecutionHandler.java
View File

@ -219,7 +219,7 @@ public abstract class ExecutionHandler extends StrolchComponent {
* @throws IllegalStateException
* if the default realm is not set!
*/
public abstract void addForExecution(Activity activity);
public abstract Controller addForExecution(Activity activity);
/**
* Registers the given {@link Activity} for execution. Execution is started when the concrete implementation deems
@ -230,7 +230,7 @@ public abstract class ExecutionHandler extends StrolchComponent {
* @param activity
* the {@link Activity}
*/
public abstract void addForExecution(String realm, Activity activity);
public abstract Controller addForExecution(String realm, Activity activity);
/**
* Registers the given {@link Activity} for execution on the default realm, and submits it for execution immediately