From af1da334965f8379434c4f0cd4c3a03c7b6dc24e Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 00:18:52 +0200
Subject: [PATCH 1/5] fixed handling of ifModified property

---
 .../apm/core/scripts/ScriptModel.java         |  27 ++++
 .../install/launchers/ApmInstallService.java  | 123 +++++++++++++-----
 2 files changed, 120 insertions(+), 30 deletions(-)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
index 558a5c8d..494988cb 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
@@ -31,10 +31,12 @@
 import com.day.cq.commons.jcr.JcrConstants;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.PostConstruct;
@@ -260,4 +262,29 @@ public static boolean isScript(Resource resource) {
   private static List<String> getArrayProperty(Resource resource, String name) {
     return Lists.newArrayList(resource.getValueMap().get(name, new String[]{}));
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj instanceof ScriptModel) {
+      ScriptModel that = (ScriptModel) obj;
+      return Objects.equals(path, that.path)
+          && Objects.equals(launchEnabled, that.launchEnabled)
+          && Objects.equals(launchMode, that.launchMode)
+          && Objects.equals(launchEnvironment, that.launchEnvironment)
+          && Arrays.equals(launchRunModes, that.launchRunModes)
+          && Objects.equals(launchHook, that.launchHook)
+          && Objects.equals(launchSchedule, that.launchSchedule)
+          && Objects.equals(checksum, that.checksum)
+          && Objects.equals(verified, that.verified);
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(path);
+  }
 }
diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index d0f9e948..f619f60b 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -34,21 +34,30 @@
 import com.cognifide.apm.core.utils.sling.SlingHelper;
 import java.lang.management.ManagementFactory;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChangeListener;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 @Component(
-    service = {ApmInstallService.class, Runnable.class},
     immediate = true,
     property = {
         Property.DESCRIPTION + "APM Launches configured scripts",
@@ -75,46 +84,77 @@ public class ApmInstallService extends AbstractLauncher implements Runnable {
   @Reference
   private History history;
 
-  private Configuration config;
+  private List<String> scriptPaths;
+
+  private boolean ifModified;
+
+  private Set<ServiceRegistration<ResourceChangeListener>> registrations;
 
   @Activate
-  public void activate(Configuration config) {
-    this.config = config;
-    process();
+  public void activate(Configuration config, BundleContext bundleContext) {
+    scriptPaths = Arrays.asList(config.scriptPaths());
+    ifModified = config.ifModified();
+    process(scriptPaths);
+    if (ifModified) {
+      registerScripts(bundleContext);
+    }
+  }
+
+  @Deactivate
+  public void deactivate() {
+    registrations.forEach(ServiceRegistration::unregister);
+    registrations.clear();
   }
 
   @Override
   public void run() {
-    process();
+    process(scriptPaths);
   }
 
-  private void process() {
-    SlingHelper.operateTraced(resolverProvider, resolver -> {
-      boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
-      String instanceName = ManagementFactory.getRuntimeMXBean().getName();
-      if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
-        processScripts(config, resolver);
-      }
-    });
+  private void process(List<String> scriptPaths) {
+    SlingHelper.operateTraced(resolverProvider, resolver -> process(scriptPaths, resolver));
   }
 
-  private void processScripts(Configuration config, ResourceResolver resolver) throws PersistenceException {
+  private void process(List<String> scriptPaths, ResourceResolver resolver) throws PersistenceException {
+    boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
+    String instanceName = ManagementFactory.getRuntimeMXBean().getName();
+    if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
+      List<Script> scripts = scriptPaths.stream()
+          .map(scriptPath -> scriptFinder
+              .find(scriptPath, resolver))
+          .filter(script -> isValid(script, resolver))
+          .collect(Collectors.toList());
+      processScripts(scripts, resolver);
+    }
+  }
+
+  private boolean isValid(Script script, ResourceResolver resolver) {
+    if (script == null) {
+      return false;
+    }
     ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver);
-    List<Script> scripts = Arrays.stream(config.scriptPaths())
-        .map(scriptPath -> scriptFinder.find(scriptPath, resolver))
-        .filter(Objects::nonNull)
-        .filter(script -> {
-          List<Script> subtree = referenceFinder.findReferences(script);
-          String checksum = versionService.countChecksum(subtree);
-          ScriptVersion scriptVersion = versionService.getScriptVersion(resolver, script);
-          HistoryEntry lastLocalRun = history.findScriptHistory(resolver, script).getLastLocalRun();
-          return !config.ifModified()
-              || !checksum.equals(scriptVersion.getLastChecksum())
-              || lastLocalRun == null
-              || !checksum.equals(lastLocalRun.getChecksum());
-        })
-        .collect(Collectors.toList());
-    processScripts(scripts, resolver);
+    List<Script> subtree = referenceFinder.findReferences(script);
+    String checksum = versionService.countChecksum(subtree);
+    ScriptVersion scriptVersion = versionService.getScriptVersion(resolver, script);
+    HistoryEntry lastLocalRun = history.findScriptHistory(resolver, script).getLastLocalRun();
+    return !ifModified || !checksum.equals(scriptVersion.getLastChecksum()) || lastLocalRun == null || !checksum.equals(lastLocalRun.getChecksum());
+  }
+
+  private void registerScripts(BundleContext bundleContext) {
+    registrations = new HashSet<>();
+    SlingHelper.operateTraced(resolverProvider, resolver ->
+        scriptPaths.forEach(scriptPath -> registerScript(scriptPath, resolver, bundleContext))
+    );
+  }
+
+  private void registerScript(String scriptPath, ResourceResolver resolver, BundleContext bundleContext) {
+    Script script = scriptFinder.find(scriptPath, resolver);
+    ScriptResourceChangeListener service = new ScriptResourceChangeListener(script, scriptPath);
+    Dictionary<String, Object> dictionary = new Hashtable<>();
+    dictionary.put(ResourceChangeListener.CHANGES, new String[]{"ADDED", "CHANGED", "REMOVED"});
+    dictionary.put(ResourceChangeListener.PATHS, scriptPath);
+    ServiceRegistration<ResourceChangeListener> registration = bundleContext.registerService(ResourceChangeListener.class, service, dictionary);
+    registrations.add(registration);
   }
 
   @Override
@@ -122,6 +162,29 @@ protected ScriptManager getScriptManager() {
     return scriptManager;
   }
 
+  private class ScriptResourceChangeListener implements ResourceChangeListener {
+
+    private Script script;
+
+    private final String scriptPath;
+
+    public ScriptResourceChangeListener(Script script, String scriptPath) {
+      this.script = script;
+      this.scriptPath = scriptPath;
+    }
+
+    @Override
+    public void onChange(List<ResourceChange> changes) {
+      SlingHelper.operateTraced(resolverProvider, resolver -> {
+        Script newScript = scriptFinder.find(scriptPath, resolver);
+        if (!Objects.equals(script, newScript)) {
+          script = newScript;
+          process(Collections.singletonList(scriptPath), resolver);
+        }
+      });
+    }
+  }
+
   @ObjectClassDefinition(name = "AEM Permission Management - Install Launcher Configuration")
   public @interface Configuration {
 

From 3042ff3c9dce627e8f78207accff8ee073db4360 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 14:55:54 +0200
Subject: [PATCH 2/5] fixed handling of ifModified property

---
 .../install/launchers/ApmInstallService.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index f619f60b..28b650d1 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -43,7 +43,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
@@ -94,7 +93,7 @@ public class ApmInstallService extends AbstractLauncher implements Runnable {
   public void activate(Configuration config, BundleContext bundleContext) {
     scriptPaths = Arrays.asList(config.scriptPaths());
     ifModified = config.ifModified();
-    process(scriptPaths);
+    processAllScripts();
     if (ifModified) {
       registerScripts(bundleContext);
     }
@@ -108,24 +107,27 @@ public void deactivate() {
 
   @Override
   public void run() {
-    process(scriptPaths);
+    processAllScripts();
   }
 
-  private void process(List<String> scriptPaths) {
-    SlingHelper.operateTraced(resolverProvider, resolver -> process(scriptPaths, resolver));
+  private void processAllScripts() {
+    SlingHelper.operateTraced(resolverProvider, resolver -> {
+      List<Script> scripts = determineScripts(scriptPaths, resolver);
+      processScripts(scripts, resolver);
+    });
   }
 
-  private void process(List<String> scriptPaths, ResourceResolver resolver) throws PersistenceException {
+  private List<Script> determineScripts(List<String> scriptPaths, ResourceResolver resolver) {
     boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
     String instanceName = ManagementFactory.getRuntimeMXBean().getName();
     if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
-      List<Script> scripts = scriptPaths.stream()
+      return scriptPaths.stream()
           .map(scriptPath -> scriptFinder
               .find(scriptPath, resolver))
           .filter(script -> isValid(script, resolver))
           .collect(Collectors.toList());
-      processScripts(scripts, resolver);
     }
+    return Collections.emptyList();
   }
 
   private boolean isValid(Script script, ResourceResolver resolver) {
@@ -179,7 +181,8 @@ public void onChange(List<ResourceChange> changes) {
         Script newScript = scriptFinder.find(scriptPath, resolver);
         if (!Objects.equals(script, newScript)) {
           script = newScript;
-          process(Collections.singletonList(scriptPath), resolver);
+          List<Script> scripts = determineScripts(Collections.singletonList(scriptPath), resolver);
+          processScripts(scripts, resolver);
         }
       });
     }

From 241388a51b3460c425839e4f794fa11a383cc6a2 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 16:13:56 +0200
Subject: [PATCH 3/5] fixed handling of ifModified property

---
 .../apm/core/utils/RuntimeUtils.java          |  9 +++++
 .../install/launchers/ApmInstallService.java  | 39 +++++++++----------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/utils/RuntimeUtils.java b/app/aem/core/src/main/java/com/cognifide/apm/core/utils/RuntimeUtils.java
index 09f59681..89f2e6be 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/utils/RuntimeUtils.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/utils/RuntimeUtils.java
@@ -19,15 +19,19 @@
  */
 package com.cognifide.apm.core.utils;
 
+import java.lang.management.ManagementFactory;
 import javax.jcr.Node;
 import javax.jcr.Session;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.ResourceResolver;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class RuntimeUtils {
 
+  private static final String AEM_MUTABLE_CONTENT_INSTANCE = "aem-install-mutable-content";
+
   public static boolean determineCompositeNodeStore(ResourceResolver resolver) {
     boolean result;
     try {
@@ -43,4 +47,9 @@ public static boolean determineCompositeNodeStore(ResourceResolver resolver) {
     return result;
   }
 
+  public static boolean isMutableContentInstance(ResourceResolver resolver) {
+    boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
+    String instanceName = ManagementFactory.getRuntimeMXBean().getName();
+    return !compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE);
+  }
 }
diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 28b650d1..9d2b94ac 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -32,7 +32,6 @@
 import com.cognifide.apm.core.services.version.VersionService;
 import com.cognifide.apm.core.utils.RuntimeUtils;
 import com.cognifide.apm.core.utils.sling.SlingHelper;
-import java.lang.management.ManagementFactory;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
@@ -42,7 +41,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
@@ -66,8 +64,6 @@
 @Designate(ocd = ApmInstallService.Configuration.class, factory = true)
 public class ApmInstallService extends AbstractLauncher implements Runnable {
 
-  private static final String AEM_MUTABLE_CONTENT_INSTANCE = "aem-install-mutable-content";
-
   @Reference
   private ResourceResolverProvider resolverProvider;
 
@@ -112,41 +108,44 @@ public void run() {
 
   private void processAllScripts() {
     SlingHelper.operateTraced(resolverProvider, resolver -> {
-      List<Script> scripts = determineScripts(scriptPaths, resolver);
-      processScripts(scripts, resolver);
+      if (RuntimeUtils.isMutableContentInstance(resolver)) {
+        List<Script> scripts = determineScripts(scriptPaths, resolver);
+        processScripts(scripts, resolver);
+      }
     });
   }
 
   private List<Script> determineScripts(List<String> scriptPaths, ResourceResolver resolver) {
-    boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
-    String instanceName = ManagementFactory.getRuntimeMXBean().getName();
-    if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
-      return scriptPaths.stream()
-          .map(scriptPath -> scriptFinder
-              .find(scriptPath, resolver))
-          .filter(script -> isValid(script, resolver))
-          .collect(Collectors.toList());
-    }
-    return Collections.emptyList();
+    return scriptPaths.stream()
+        .map(scriptPath -> scriptFinder.find(scriptPath, resolver))
+        .filter(script -> isValid(script, resolver))
+        .collect(Collectors.toList());
   }
 
   private boolean isValid(Script script, ResourceResolver resolver) {
     if (script == null) {
       return false;
     }
+    if (!ifModified) {
+      return true;
+    }
     ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver);
     List<Script> subtree = referenceFinder.findReferences(script);
     String checksum = versionService.countChecksum(subtree);
     ScriptVersion scriptVersion = versionService.getScriptVersion(resolver, script);
     HistoryEntry lastLocalRun = history.findScriptHistory(resolver, script).getLastLocalRun();
-    return !ifModified || !checksum.equals(scriptVersion.getLastChecksum()) || lastLocalRun == null || !checksum.equals(lastLocalRun.getChecksum());
+    return !checksum.equals(scriptVersion.getLastChecksum())
+        || lastLocalRun == null
+        || !checksum.equals(lastLocalRun.getChecksum());
   }
 
   private void registerScripts(BundleContext bundleContext) {
     registrations = new HashSet<>();
-    SlingHelper.operateTraced(resolverProvider, resolver ->
-        scriptPaths.forEach(scriptPath -> registerScript(scriptPath, resolver, bundleContext))
-    );
+    SlingHelper.operateTraced(resolverProvider, resolver -> {
+      if (RuntimeUtils.isMutableContentInstance(resolver)) {
+        scriptPaths.forEach(scriptPath -> registerScript(scriptPath, resolver, bundleContext));
+      }
+    });
   }
 
   private void registerScript(String scriptPath, ResourceResolver resolver, BundleContext bundleContext) {

From b7c491dd6c69cf0426c68002a2c88ca0be6aac3d Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 16:26:46 +0200
Subject: [PATCH 4/5] fixed handling of ifModified property

---
 .../cognifide/apm/install/launchers/ApmInstallService.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 9d2b94ac..7d5da6e5 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -90,9 +90,7 @@ public void activate(Configuration config, BundleContext bundleContext) {
     scriptPaths = Arrays.asList(config.scriptPaths());
     ifModified = config.ifModified();
     processAllScripts();
-    if (ifModified) {
-      registerScripts(bundleContext);
-    }
+    registerScripts(bundleContext);
   }
 
   @Deactivate
@@ -142,7 +140,7 @@ private boolean isValid(Script script, ResourceResolver resolver) {
   private void registerScripts(BundleContext bundleContext) {
     registrations = new HashSet<>();
     SlingHelper.operateTraced(resolverProvider, resolver -> {
-      if (RuntimeUtils.isMutableContentInstance(resolver)) {
+      if (ifModified && RuntimeUtils.isMutableContentInstance(resolver)) {
         scriptPaths.forEach(scriptPath -> registerScript(scriptPath, resolver, bundleContext));
       }
     });

From 788b0480bc8b1f3cdd1fe4d3c100ea42f291112b Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 16:31:04 +0200
Subject: [PATCH 5/5] fixed handling of ifModified property

---
 .../install/launchers/ApmInstallService.java  | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 7d5da6e5..16797383 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -114,29 +114,23 @@ private void processAllScripts() {
   }
 
   private List<Script> determineScripts(List<String> scriptPaths, ResourceResolver resolver) {
+    ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver);
     return scriptPaths.stream()
         .map(scriptPath -> scriptFinder.find(scriptPath, resolver))
-        .filter(script -> isValid(script, resolver))
+        .filter(Objects::nonNull)
+        .filter(script -> {
+          List<Script> subtree = referenceFinder.findReferences(script);
+          String checksum = versionService.countChecksum(subtree);
+          ScriptVersion scriptVersion = versionService.getScriptVersion(resolver, script);
+          HistoryEntry lastLocalRun = history.findScriptHistory(resolver, script).getLastLocalRun();
+          return !ifModified
+              || !checksum.equals(scriptVersion.getLastChecksum())
+              || lastLocalRun == null
+              || !checksum.equals(lastLocalRun.getChecksum());
+        })
         .collect(Collectors.toList());
   }
 
-  private boolean isValid(Script script, ResourceResolver resolver) {
-    if (script == null) {
-      return false;
-    }
-    if (!ifModified) {
-      return true;
-    }
-    ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver);
-    List<Script> subtree = referenceFinder.findReferences(script);
-    String checksum = versionService.countChecksum(subtree);
-    ScriptVersion scriptVersion = versionService.getScriptVersion(resolver, script);
-    HistoryEntry lastLocalRun = history.findScriptHistory(resolver, script).getLastLocalRun();
-    return !checksum.equals(scriptVersion.getLastChecksum())
-        || lastLocalRun == null
-        || !checksum.equals(lastLocalRun.getChecksum());
-  }
-
   private void registerScripts(BundleContext bundleContext) {
     registrations = new HashSet<>();
     SlingHelper.operateTraced(resolverProvider, resolver -> {