FindBugs: Use Jenkins#getActiveInstance() instead of the old Hudson c…

…lass
jenkinsci · Jun 12, 2017 · cccc9e2 · cccc9e2
1 parent a5ebdbb
commit cccc9e2
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 34 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/BackupObject.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/BackupObject.java
@@ -27,12 +27,12 @@
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.io.Files;
-import hudson.model.Hudson;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Date;
+import jenkins.model.Jenkins;
 
 public class BackupObject implements Comparable {
 
@@ -75,7 +75,7 @@ public static Function<File, BackupObject> getFromFile() {
             public BackupObject apply(File file) {
                 if(file != null) {
                     try {
-                        return (BackupObject) Hudson.XSTREAM.fromXML(Files.toString(file, Charset.defaultCharset()));
+                        return (BackupObject) Jenkins.XSTREAM.fromXML(Files.toString(file, Charset.defaultCharset()));
                     } catch (IOException e) {
                         return null;
                     }
@@ -94,7 +94,7 @@ public static Function<String, BackupObject> getFromString() {
         return new Function<String, BackupObject>() {
             public BackupObject apply(String content) {
                 if (content != null) {
-                    return (BackupObject) Hudson.XSTREAM.fromXML(content);
+                    return (BackupObject) Jenkins.XSTREAM.fromXML(content);
                 } else {
                     return null;
                 }
@@ -113,7 +113,7 @@ public String getDisplayName() {
     }
 
     public String getAsString() {
-        return Hudson.XSTREAM.toXML(this);
+        return Jenkins.XSTREAM.toXML(this);
     }
 
     @Override

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/ConfigOnly.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/ConfigOnly.java
@@ -36,6 +36,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -59,7 +60,7 @@ public String getDisplayName() {
 
     @Override
     public Iterable<File> getFilesToBackup() throws PeriodicBackupException {
-        File rootDir = Hudson.getInstance().getRootDir();
+        File rootDir = Jenkins.getActiveInstance().getRootDir();
         List<File> filesToBackup = Lists.newArrayList();
         addRootFiles(rootDir, filesToBackup);
         addJobFiles(rootDir, filesToBackup);

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/FileManager.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/FileManager.java
@@ -28,10 +28,10 @@
 import hudson.DescriptorExtensionList;
 import hudson.model.AbstractModelObject;
 import hudson.model.Describable;
-import hudson.model.Hudson;
 
 import java.io.File;
 import java.io.IOException;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -68,13 +68,14 @@ public void restoreFiles(File finalResultDir) throws IOException, PeriodicBackup
      * @return Collection of FileManager Descriptors
      */
     public static DescriptorExtensionList<FileManager, FileManagerDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(FileManager.class);
+        return Jenkins.getActiveInstance().getDescriptorList(FileManager.class);
     }
 
     public FileManagerDescriptor getDescriptor() {
-        return (FileManagerDescriptor) Hudson.getInstance().getDescriptor(getClass());
+        return (FileManagerDescriptor) Jenkins.getActiveInstance().getDescriptor(getClass());
     }
 
+    @Override
     public String getSearchUrl() {
         return "FileManager";
     }

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/FullBackup.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/FullBackup.java
@@ -29,13 +29,13 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import hudson.Extension;
-import hudson.model.Hudson;
 import org.apache.tools.ant.DirectoryScanner;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import jenkins.model.Jenkins;
 
 
 /**
@@ -51,7 +51,7 @@ public class FullBackup extends FileManager {
 
     @DataBoundConstructor
 	public FullBackup(String excludesString) {
-		this(excludesString, Hudson.getInstance().getRootDir());
+		this(excludesString, Jenkins.getActiveInstance().getRootDir());
 	}
 
     /**

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/Location.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/Location.java
@@ -27,10 +27,10 @@
 import hudson.DescriptorExtensionList;
 import hudson.model.AbstractModelObject;
 import hudson.model.Describable;
-import hudson.model.Hudson;
 
 import java.io.File;
 import java.io.IOException;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -87,13 +87,15 @@ public Location(boolean enabled) {
      * @return Collection of FileManager Descriptors
      */
     public static DescriptorExtensionList<Location, LocationDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(Location.class);
+        return Jenkins.getActiveInstance().getDescriptorList(Location.class);
     }
 
+    @Override
     public LocationDescriptor getDescriptor() {
-        return (LocationDescriptor) Hudson.getInstance().getDescriptor(getClass());
+        return (LocationDescriptor) Jenkins.getActiveInstance().getDescriptor(getClass());
     }
 
+    @Override
     public String getSearchUrl() {
         return "Location";
     }

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/NullStorage.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/NullStorage.java
@@ -26,13 +26,13 @@
 
 import com.google.common.collect.Lists;
 import hudson.Extension;
-import hudson.model.Hudson;
 import org.apache.commons.io.FileUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 public class NullStorage extends Storage {
 
@@ -63,7 +63,7 @@ public void backupStart(String tempDirectoryPath, String archiveFilenameBase) th
     public void backupAddFile(File fileToStore) throws PeriodicBackupException {
         try {
             FileUtils.copyFile(fileToStore, new File(destinationDirectory,
-                    Util.getRelativePath(fileToStore, Hudson.getInstance().getRootDir())));
+                    Util.getRelativePath(fileToStore, Jenkins.getActiveInstance().getRootDir())));
         } catch (IOException e) {
             LOGGER.warning("Could not copy " + fileToStore.getAbsolutePath() + " to " + destinationDirectory);
         }

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/OverwriteRestorePolicy.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/OverwriteRestorePolicy.java
@@ -24,12 +24,12 @@
 
 package org.jenkinsci.plugins.periodicbackup;
 
-import hudson.model.Hudson;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -41,7 +41,7 @@ public class OverwriteRestorePolicy implements RestorePolicy {
     private static final Logger LOGGER = Logger.getLogger(OverwriteRestorePolicy.class.getName());
 
     public void restore(File tempDir) throws IOException {
-        File hudsonRoot = Hudson.getInstance().getRootDir();
+        File hudsonRoot = Jenkins.getActiveInstance().getRootDir();
 
         FileUtils.copyDirectory(tempDir, hudsonRoot);
         LOGGER.info("Restoring of files finished");

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/PeriodicBackupLink.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/PeriodicBackupLink.java
@@ -44,6 +44,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -192,12 +193,12 @@ public void save() throws IOException {
 
     protected XmlFile getConfigXml() {
         return new XmlFile(Hudson.XSTREAM,
-                new File(Hudson.getInstance().getRootDir(), "periodicBackup.xml"));
+                new File(Jenkins.getActiveInstance().getRootDir(), "periodicBackup.xml"));
     }
 
     @SuppressWarnings("unused")
     public String getRootDirectory() {
-        return Hudson.getInstance().getRootDir().getAbsolutePath();
+        return Jenkins.getActiveInstance().getRootDir().getAbsolutePath();
     }
 
     @SuppressWarnings("unused")

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/PeriodicBackupPlugin.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/PeriodicBackupPlugin.java
@@ -3,11 +3,11 @@
 import hudson.Plugin;
 import hudson.logging.LogRecorder;
 import hudson.logging.LogRecorder.Target;
-import hudson.model.Hudson;
 import hudson.security.ACL;
 
 import java.io.IOException;
 import java.util.logging.Level;
+import jenkins.model.Jenkins;
 
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;
@@ -53,11 +53,11 @@ private void updateDebugLogger(final Level level, final String... debugLoggerNam
 
     try {
       for (String current : debugLoggerNames) {
-        LogRecorder recorder = Hudson.getInstance().getLog().getLogRecorder(current);
+        LogRecorder recorder = Jenkins.getActiveInstance().getLog().getLogRecorder(current);
 
         if (recorder == null) {
-          Hudson.getInstance().getLog().doNewLogRecorder(current);
-          recorder = Hudson.getInstance().getLog().getLogRecorder(current);
+          Jenkins.getActiveInstance().getLog().doNewLogRecorder(current);
+          recorder = Jenkins.getActiveInstance().getLog().getLogRecorder(current);
           recorder.targets.add(new Target(current, level));
 
           try {

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/ReplaceRestorePolicy.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/ReplaceRestorePolicy.java
@@ -25,13 +25,13 @@
 package org.jenkinsci.plugins.periodicbackup;
 
 import com.google.common.collect.Lists;
-import hudson.model.Hudson;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -46,7 +46,7 @@ public class ReplaceRestorePolicy implements RestorePolicy {
     private transient int filesDeleted, filesReplaced, filesKept;
 
     public void restore(File tempDir) throws IOException, PeriodicBackupException {
-        hudsonRoot = Hudson.getInstance().getRootDir();
+        hudsonRoot = Jenkins.getActiveInstance().getRootDir();
         if(hudsonRoot == null) {
             throw new PeriodicBackupException("HOME directory is unidentified.");
         }

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/RestoreExecutor.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/RestoreExecutor.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.plugins.periodicbackup;
 
-import hudson.model.Hudson;
 import hudson.security.ACL;
 import org.acegisecurity.Authentication;
 import org.acegisecurity.context.SecurityContextHolder;
@@ -34,6 +33,7 @@
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 public class RestoreExecutor implements Runnable {
 
@@ -107,7 +107,7 @@ public void run() {
         Authentication origAuth = SecurityContextHolder.getContext().getAuthentication();
         SecurityContextHolder.getContext().setAuthentication(ACL.SYSTEM);
         try {
-            Hudson.getInstance().doReload();
+            Jenkins.getActiveInstance().doReload();
         } catch (IOException e) {
             LOGGER.log(Level.WARNING, "Error reloading config files from disk: {0}", e.getMessage());
         } finally {

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/Storage.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/Storage.java
@@ -27,9 +27,9 @@
 import hudson.DescriptorExtensionList;
 import hudson.model.AbstractModelObject;
 import hudson.model.Describable;
-import hudson.model.Hudson;
 
 import java.io.File;
+import jenkins.model.Jenkins;
 
 /**
  *
@@ -76,7 +76,7 @@ public abstract class Storage extends AbstractModelObject implements Describable
     public abstract void unarchiveFiles(Iterable<File> archives, File finalResultDir);
 
     public StorageDescriptor getDescriptor() {
-        return (StorageDescriptor) Hudson.getInstance().getDescriptor(getClass());
+        return (StorageDescriptor) Jenkins.getActiveInstance().getDescriptor(getClass());
     }
 
     public String getSearchUrl() {
@@ -90,7 +90,7 @@ public String getSearchUrl() {
      * @return Collection of FileManager Descriptors
      */
     public static DescriptorExtensionList<Storage, StorageDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(Storage.class);
+        return Jenkins.getActiveInstance().getDescriptorList(Storage.class);
     }
 
 }
diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/TarGzStorage.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/TarGzStorage.java
@@ -26,7 +26,6 @@
 
 import com.google.common.collect.Lists;
 import hudson.Extension;
-import hudson.model.Hudson;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.tar.TarArchiver;
 import org.codehaus.plexus.archiver.tar.TarGZipUnArchiver;
@@ -37,6 +36,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 public class TarGzStorage extends Storage {
 
@@ -76,7 +76,7 @@ public void backupStart(String tempDirectoryPath, String archiveFilenameBase) th
     @Override
     public void backupAddFile(File fileToStore) throws PeriodicBackupException {
         try {
-            archiver.addFile(fileToStore, Util.getRelativePath(fileToStore, Hudson.getInstance().getRootDir()));
+            archiver.addFile(fileToStore, Util.getRelativePath(fileToStore, Jenkins.getActiveInstance().getRootDir()));
         } catch (ArchiverException e) {
             LOGGER.warning("Could not add file to the archive. " + e.getMessage());
         }

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/ZipStorage.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/ZipStorage.java
@@ -26,7 +26,6 @@
 
 import com.google.common.collect.Sets;
 import hudson.Extension;
-import hudson.model.Hudson;
 import net.sf.json.JSONObject;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
@@ -39,6 +38,7 @@
 import java.io.IOException;
 import java.util.Set;
 import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 
 public class ZipStorage extends Storage {
 
@@ -183,7 +183,7 @@ private void createNewArchive() {
      */
     private void addFile(File fileToStore) {
         try {
-            archiver.addFile(fileToStore, Util.getRelativePath(fileToStore, Hudson.getInstance().getRootDir()));
+            archiver.addFile(fileToStore, Util.getRelativePath(fileToStore, Jenkins.getActiveInstance().getRootDir()));
             currentArchiveFilesCount++;
             currentArchiveTotalFilesSize += fileToStore.length();
         } catch (ArchiverException e) {