fix: litening for job changes with both SaveableListener and ItemListener (refs #319)

Author: tomasbjerre

debug.sh

@@ -3,6 +3,6 @@
 MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n" \
  ./mvnw hpi:run \
  -Djava.util.logging.config.file=logging.properties \
- -Djenkins.version=2.361.4 \
+ -Djenkins.version=2.452.2 \
  -Denforcer.skip=true \
  -Dhudson.model.ParametersAction.keepUndefinedParameters=true

run.sh

@@ -2,6 +2,6 @@
 ./mvnw versions:update-properties
 ./mvnw hpi:run \
  -Djava.util.logging.config.file=logging.properties \
- -Djenkins.version=2.426.3 \
+ -Djenkins.version=2.452.2 \
  -Denforcer.skip=true \
  -Dhudson.model.ParametersAction.keepUndefinedParameters=true

src/main/java/org/jenkinsci/plugins/gwt/jobfinder/JobFinderImpersonater.java

@@ -1,8 +1,11 @@
 package org.jenkinsci.plugins.gwt.jobfinder;
 
 import hudson.Extension;
+import hudson.XmlFile;
 import hudson.model.Item;
+import hudson.model.Saveable;
 import hudson.model.listeners.ItemListener;
+import hudson.model.listeners.SaveableListener;
 import hudson.security.ACL;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,11 +19,60 @@
 import org.acegisecurity.context.SecurityContext;
 import org.acegisecurity.context.SecurityContextHolder;
 
-@Extension
-public class JobFinderImpersonater extends ItemListener {
+public class JobFinderImpersonater {
   private static Logger LOGGER = Logger.getLogger(JobFinderImpersonater.class.getName());
   private static final Map<String, ParameterizedJob> JOBS_WITH_GWT = new ConcurrentHashMap<>();
 
+  @Extension
+  public static class JobItemListener extends ItemListener {
+    @Override
+    public void onLoaded() {
+      for (final ParameterizedJob job : doGetAllParameterizedJobs(true)) {
+        JobFinderImpersonater.putJob(job);
+      }
+      LOGGER.info("Loaded " + JOBS_WITH_GWT.size() + " jobs in cache");
+    }
+
+    @Override
+    public void onUpdated(final Item job) {
+      JobFinderImpersonater.putJob(job);
+    }
+
+    @Override
+    public void onCreated(final Item job) {
+      JobFinderImpersonater.putJob(job);
+    }
+
+    @Override
+    public void onDeleted(final Item job) {
+      JobFinderImpersonater.deleteJob(job);
+    }
+
+    @Override
+    public void onCopied(final Item src, final Item job) {
+      JobFinderImpersonater.putJob(job);
+    }
+
+    @Override
+    public void onLocationChanged(
+        final Item item, final String oldFullName, final String newFullName) {
+      JOBS_WITH_GWT.remove(oldFullName);
+      JobFinderImpersonater.putJob(item);
+    }
+  }
+
+  @Extension
+  public static class JobItemSaveListener extends SaveableListener {
+    @Override
+    public void onChange(final Saveable o, final XmlFile file) {
+      if (o instanceof ParameterizedJob) {
+        final ParameterizedJob<?, ?> job = (ParameterizedJob<?, ?>) o;
+        LOGGER.finest("Saving " + job.getFullName());
+        JobFinderImpersonater.putJob(job);
+      }
+    }
+  }
+
   public List<ParameterizedJob> getAllParameterizedJobs(final boolean impersonate) {
     if (LOGGER.isLoggable(Level.FINEST)) {
       LOGGER.finest("There are " + this.JOBS_WITH_GWT.size() + " jobs in cache:");
@@ -55,53 +107,18 @@ private static List<ParameterizedJob> doGetAllParameterizedJobs(final boolean im
     }
   }
 
-  @Override
-  public void onLoaded() {
-    for (final ParameterizedJob job : doGetAllParameterizedJobs(true)) {
-      this.putJob(job);
-    }
-    LOGGER.info("Loaded " + this.JOBS_WITH_GWT.size() + " jobs in cache");
-  }
-
-  @Override
-  public void onUpdated(final Item job) {
-    this.putJob(job);
-  }
-
-  @Override
-  public void onCreated(final Item job) {
-    this.putJob(job);
-  }
-
-  @Override
-  public void onDeleted(final Item job) {
-    this.deleteJob(job);
-  }
-
-  @Override
-  public void onCopied(final Item src, final Item job) {
-    this.putJob(job);
-  }
-
-  @Override
-  public void onLocationChanged(
-      final Item item, final String oldFullName, final String newFullName) {
-    this.JOBS_WITH_GWT.remove(oldFullName);
-    this.putJob(item);
-  }
-
-  private void putJob(final Item job) {
+  private static void putJob(final Item job) {
     if (job instanceof ParameterizedJob) {
       final ParameterizedJob parameterizedJob = (ParameterizedJob) job;
       final boolean hasGenericTrigger =
           GenericTriggerFinder.findGenericTrigger(parameterizedJob.getTriggers()) != null;
       if (hasGenericTrigger) {
-        this.JOBS_WITH_GWT.put(parameterizedJob.getFullName(), parameterizedJob);
+        JOBS_WITH_GWT.put(parameterizedJob.getFullName(), parameterizedJob);
       }
     }
   }
 
-  private void deleteJob(final Item job) {
-    this.JOBS_WITH_GWT.remove(job.getFullName());
+  private static void deleteJob(final Item job) {
+    JOBS_WITH_GWT.remove(job.getFullName());
   }
 }