From a82238b88826c28d65c60dfd5d040f93cdc75648 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sat, 26 Mar 2016 11:51:06 -0700
Subject: [PATCH] Simplified by using instance methods

---
 .../java/hudson/diagnosis/NullIdDescriptorMonitor.java    | 8 ++------
 core/src/main/java/jenkins/model/Uptime.java              | 4 ++--
 .../java/jenkins/security/RekeySecretAdminMonitor.java    | 8 +++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
index 8892fb1f2a..b33e36e81b 100644
--- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
@@ -60,7 +60,8 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
         return Collections.unmodifiableList(problems);
     }
 
-    private void verify() {
+    @Initializer(after=EXTENSIONS_AUGMENTED)
+    public void verify() {
         Jenkins h = Jenkins.getInstance();
         for (Descriptor d : h.getExtensionList(Descriptor.class)) {
             PluginWrapper p = h.getPluginManager().whichPlugin(d.getClass());
@@ -81,10 +82,5 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
         }
     }
 
-    @Initializer(after=EXTENSIONS_AUGMENTED)
-    public static void verifyId() {
-        AdministrativeMonitor.all().get(NullIdDescriptorMonitor.class).verify();
-    }
-
     private static final Logger LOGGER = Logger.getLogger(NullIdDescriptorMonitor.class.getName());
 }
diff --git a/core/src/main/java/jenkins/model/Uptime.java b/core/src/main/java/jenkins/model/Uptime.java
index 81cce79374..190c678ff7 100644
--- a/core/src/main/java/jenkins/model/Uptime.java
+++ b/core/src/main/java/jenkins/model/Uptime.java
@@ -27,7 +27,7 @@ public class Uptime {
     }
 
     @Initializer(after=InitMilestone.JOB_LOADED)
-    public static void init() {
-        ExtensionList.lookup(Uptime.class).get(0).startTime = System.currentTimeMillis();
+    public void init() {
+        startTime = System.currentTimeMillis();
     }
 }
diff --git a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java b/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
index ea96951bcf..ff0a92a84f 100644
--- a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
+++ b/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
@@ -113,13 +113,11 @@ public class RekeySecretAdminMonitor extends AsynchronousAdministrativeMonitor i
 
     @Initializer(fatal=false,after=InitMilestone.PLUGINS_STARTED,before=InitMilestone.EXTENSIONS_AUGMENTED)
     // as early as possible, but this needs to be late enough that the ConfidentialStore is available
-    public static void scanOnReboot() throws InterruptedException, IOException, GeneralSecurityException {
-        RekeySecretAdminMonitor m = new RekeySecretAdminMonitor();  // throw-away instance
-
-        FileBoolean flag = m.scanOnBoot;
+    public void scanOnReboot() throws InterruptedException, IOException, GeneralSecurityException {
+        FileBoolean flag = scanOnBoot;
         if (flag.isOn()) {
             flag.off();
-            m.start(false).join();
+            start(false).join();
             // block the boot until the rewrite process is complete
             // don't let the failure in RekeyThread block Jenkins boot.
         }
-- 
GitLab