[JENKINS-17680] use @Initializer instead of ItemListener.

jenkinsci · Aug 3, 2013 · 854deb1 · 854deb1
1 parent bc9cc18
commit 854deb1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 90 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
@@ -32,6 +32,8 @@
 import hudson.Util;
 import hudson.console.HyperlinkNote;
 import hudson.diagnosis.OldDataMonitor;
+import hudson.init.InitMilestone;
+import hudson.init.Initializer;
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.MatrixProject;
 import hudson.maven.MavenModuleSet;
@@ -83,6 +85,10 @@
  */
 public class CopyArtifact extends Builder {
 
+    // specifies upgradeCopyArtifact is needed to work.
+    private static boolean upgradeNeeded = false;
+    private static Logger LOGGER = Logger.getLogger(CopyArtifact.class.getName());
+
     @Deprecated private String projectName;
     private String project;
     private String parameters;
@@ -126,10 +132,43 @@ public static class ConverterImpl extends XStream2.PassthruConverter<CopyArtifac
             if (obj.isUpgradeNeeded()) {
                 // A Copy Artifact to be upgraded.
                 // For information of the containing project is needed, 
-                // The upgrade will be performed by CopyArtifactUpgradeListener.
-                CopyArtifactUpgradeListener.setUpgradeNeeded();
+                // The upgrade will be performed by upgradeCopyArtifact.
+                setUpgradeNeeded();
+            }
+        }
+    }
+
+    private static synchronized void setUpgradeNeeded() {
+        if (!upgradeNeeded) {
+            LOGGER.info("Upgrade for Copy Artifact is scheduled.");
+            upgradeNeeded = true;
+        }
+    }
+
+    @Initializer(after=InitMilestone.JOB_LOADED)
+    public static void upgradeCopyArtifact() {
+        if (!upgradeNeeded) {
+            return;
+        }
+        upgradeNeeded = false;
+
+        boolean isUpgraded = false;
+        for (Project<?,?> project: Jenkins.getInstance().getAllItems(Project.class)) {
+            for (CopyArtifact target: Util.filter(project.getBuilders(), CopyArtifact.class)) {
+                try {
+                    if (target.upgradeIfNecessary(project)) {
+                        isUpgraded = true;
+                    }
+                } catch(IOException e) {
+                    LOGGER.log(Level.SEVERE, String.format("Failed to upgrade CopyArtifact in %s", project.getFullName()), e);
+                }
             }
         }
+
+        if (!isUpgraded) {
+            // No CopyArtifact is upgraded.
+            LOGGER.warning("Update of CopyArtifact is scheduled, but no CopyArtifact to upgrade was found!");
+        }
     }
 
     public String getProjectName() {
@@ -160,8 +199,7 @@ public boolean isOptional() {
         return optional != null && optional;
     }
 
-    /* package scope */
-    boolean upgradeIfNecessary(AbstractProject<?,?> job) throws IOException {
+    private boolean upgradeIfNecessary(AbstractProject<?,?> job) throws IOException {
         if (isUpgradeNeeded()) {
             int i = projectName.lastIndexOf('/');
             if (i != -1 && projectName.indexOf('=', i) != -1 && /* not matrix */Jenkins.getInstance().getItem(projectName, job.getParent(), Job.class) == null) {
@@ -171,7 +209,7 @@ boolean upgradeIfNecessary(AbstractProject<?,?> job) throws IOException {
                 project = projectName;
                 parameters = null;
             }
-            Logger.getLogger(CopyArtifact.class.getName()).log(Level.INFO, "Split {0} into {1} with parameters {2}", new Object[] {projectName, project, parameters});
+            LOGGER.log(Level.INFO, "Split {0} into {1} with parameters {2}", new Object[] {projectName, project, parameters});
             projectName = null;
             job.save();
             return true;

diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifactUpgradeListener.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifactUpgradeListener.java