Decoupled event listeners

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/code/ExecutionHistoryManager.java

@@ -0,0 +1,40 @@
+package dev.vml.es.acm.core.code;
+
+import dev.vml.es.acm.core.event.Event;
+import dev.vml.es.acm.core.event.EventListener;
+import dev.vml.es.acm.core.event.EventType;
+import dev.vml.es.acm.core.util.ResolverUtils;
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component(service = EventListener.class, immediate = true)
+public class ExecutionHistoryManager implements EventListener {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionHistoryManager.class);
+
+ @Reference
+ private ResourceResolverFactory resourceResolverFactory;
+
+ @Override
+ public void onEvent(Event event) {
+ EventType eventType = EventType.of(event.getName()).orElse(null);
+ if (eventType == EventType.HISTORY_CLEAR) {
+ clear();
+ }
+ }
+
+ public void clear() {
+ try (ResourceResolver resolver = ResolverUtils.contentResolver(resourceResolverFactory, null)) {
+ ExecutionHistory executionHistory = new ExecutionHistory(resolver);
+ executionHistory.clear();
+ LOG.info("Execution history cleared successfully");
+ } catch (LoginException e) {
+ LOG.error("Cannot access repository while clearing history!", e);
+ }
+ }
+}

core/src/main/java/dev/vml/es/acm/core/code/ExecutionQueue.java

@@ -1,6 +1,9 @@
 package dev.vml.es.acm.core.code;
 
 import dev.vml.es.acm.core.AcmException;
+import dev.vml.es.acm.core.event.Event;
+import dev.vml.es.acm.core.event.EventListener;
+import dev.vml.es.acm.core.event.EventType;
 import dev.vml.es.acm.core.util.ResolverUtils;
 import dev.vml.es.acm.core.util.StreamUtils;
 import java.util.*;
@@ -28,11 +31,11 @@
 
 @Component(
  immediate = true,
- service = {ExecutionQueue.class, JobExecutor.class},
+ service = {ExecutionQueue.class, JobExecutor.class, EventListener.class},
  property = {JobExecutor.PROPERTY_TOPICS + "=" + ExecutionQueue.TOPIC})
 @Designate(ocd = ExecutionQueue.Config.class)
 @SuppressWarnings("java:S1181")
-public class ExecutionQueue implements JobExecutor {
+public class ExecutionQueue implements JobExecutor, EventListener {
 
  public static final String TOPIC = "dev/vml/es/acm/ExecutionQueue";
 
@@ -77,6 +80,14 @@ protected void deactivate() {
  }
  }
 
+ @Override
+ public void onEvent(Event event) {
+ EventType eventType = EventType.of(event.getName()).orElse(null);
+ if (eventType == EventType.EXECUTOR_RESET) {
+ reset();
+ }
+ }
+
  public Execution submit(Executable executable, ExecutionContextOptions contextOptions) throws AcmException {
  long currentSize = getCurrentSize();
  if (currentSize >= getMaxSize()) {

core/src/main/java/dev/vml/es/acm/core/code/Executor.java

@@ -3,6 +3,9 @@
 import dev.vml.es.acm.core.AcmConstants;
 import dev.vml.es.acm.core.AcmException;
 import dev.vml.es.acm.core.code.script.ContentScript;
+import dev.vml.es.acm.core.event.Event;
+import dev.vml.es.acm.core.event.EventListener;
+import dev.vml.es.acm.core.event.EventType;
 import dev.vml.es.acm.core.format.TemplateFormatter;
 import dev.vml.es.acm.core.instance.InstanceSettings;
 import dev.vml.es.acm.core.notification.NotificationManager;
@@ -29,10 +32,12 @@
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
-@Component(immediate = true, service = Executor.class)
+@Component(
+ immediate = true,
+ service = {Executor.class, EventListener.class})
 @Designate(ocd = Executor.Config.class)
 @SuppressWarnings("java:S1181")
-public class Executor {
+public class Executor implements EventListener {
 
  public static final String LOCK_DIR = "executor";
 
@@ -112,6 +117,14 @@ protected void activate(Config config) {
  this.config = config;
  }
 
+ @Override
+ public void onEvent(Event event) {
+ EventType eventType = EventType.of(event.getName()).orElse(null);
+ if (eventType == EventType.EXECUTOR_RESET) {
+ reset();
+ }
+ }
+
  public ExecutionContext createContext(
  String id, ExecutionMode mode, Executable executable, ResourceResolver resourceResolver) {
  CodeContext codeContext = new CodeContext(osgiContext, resourceResolver);

core/src/main/java/dev/vml/es/acm/core/event/EventDispatcher.java

@@ -5,14 +5,16 @@
 import dev.vml.es.acm.core.code.schedule.BootSchedule;
 import dev.vml.es.acm.core.code.schedule.CronSchedule;
 import dev.vml.es.acm.core.code.schedule.NoneSchedule;
+import dev.vml.es.acm.core.event.Event;
+import dev.vml.es.acm.core.event.EventListener;
+import dev.vml.es.acm.core.event.EventType;
 import dev.vml.es.acm.core.instance.HealthChecker;
 import dev.vml.es.acm.core.instance.HealthStatus;
 import dev.vml.es.acm.core.osgi.InstanceInfo;
 import dev.vml.es.acm.core.osgi.InstanceType;
 import dev.vml.es.acm.core.repo.Repo;
 import dev.vml.es.acm.core.util.ChecksumUtils;
 import dev.vml.es.acm.core.util.ResolverUtils;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -34,7 +36,7 @@
 import org.slf4j.LoggerFactory;
 
 @Component(
- service = {ResourceChangeListener.class, AutomaticScriptScheduler.class},
+ service = {ResourceChangeListener.class, EventListener.class},
  immediate = true,
  property = {
  ResourceChangeListener.PATHS + "=glob:" + ScriptRepository.ROOT + "/automatic/**/*.groovy",
@@ -43,7 +45,7 @@
  ResourceChangeListener.CHANGES + "=REMOVED"
  })
 @Designate(ocd = AutomaticScriptScheduler.Config.class)
-public class AutomaticScriptScheduler implements ResourceChangeListener {
+public class AutomaticScriptScheduler implements ResourceChangeListener, EventListener {
 
  private static final Logger LOG = LoggerFactory.getLogger(AutomaticScriptScheduler.class);
 
@@ -132,6 +134,14 @@ public void onChange(List<ResourceChange> changes) {
  }
  }
 
+ @Override
+ public void onEvent(Event event) {
+ EventType eventType = EventType.of(event.getName()).orElse(null);
+ if (eventType == EventType.SCRIPT_SCHEDULER_BOOT) {
+ bootOnDemand();
+ }
+ }
+
  public void bootOnDemand() {
  LOG.info("Automatic scripts booting on demand - job scheduling");
  unscheduleBoot();

core/src/main/java/dev/vml/es/acm/core/script/AutomaticScriptScheduler.java

@@ -3,9 +3,10 @@
 import static dev.vml.es.acm.core.util.ServletResult.*;
 import static dev.vml.es.acm.core.util.ServletUtils.respondJson;
 
-import dev.vml.es.acm.core.event.EventDispatcher;
+import dev.vml.es.acm.core.event.EventManager;
 import dev.vml.es.acm.core.event.EventType;
 import java.io.IOException;
+import java.util.Collections;
 import javax.servlet.Servlet;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
@@ -32,7 +33,7 @@ public class EventServlet extends SlingAllMethodsServlet {
  private static final Logger LOG = LoggerFactory.getLogger(EventServlet.class);
 
  @Reference
- private transient EventDispatcher dispatcher;
+ private transient EventManager eventManager;
 
  @Override
  protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
@@ -44,7 +45,7 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
  }
 
  try {
- dispatcher.dispatch(event);
+ eventManager.triggerEvent(event.name().toLowerCase(), Collections.emptyMap());
  respondJson(response, ok(String.format("Event '%s' dispatched successfully!", name)));
  } catch (Exception e) {
  LOG.error("Event '{}' cannot be dispatched!", name, e);