Merge pull request #1155 from daspilker/instance

Jenkins.getInstance() -> Jenkins.get()
jenkinsci · Jan 8, 2019 · 9fdd595 · 9fdd595
2 parents 86b4604 + 0093e78
commit 9fdd595
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 38 deletions.
diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ContextExtensionPoint.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ContextExtensionPoint.java
@@ -58,6 +58,6 @@ public static void executeInContext(Runnable runnable, Context context) {
      * @return a list of all registered JobDslContextExtensionPoints.
      */
     public static ExtensionList<ContextExtensionPoint> all() {
-        return Jenkins.getInstance().getExtensionList(ContextExtensionPoint.class);
+        return Jenkins.get().getExtensionList(ContextExtensionPoint.class);
     }
 }
diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/DescriptorImpl.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/DescriptorImpl.java
@@ -109,7 +109,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
     }
 
     public String getScriptApprovalWarning() {
-        return isSecurityEnabled() && !Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS) ? Messages.ScriptSecurity_ScriptApprovalWarning() : "";
+        return isSecurityEnabled() && !Jenkins.get().hasPermission(Jenkins.RUN_SCRIPTS) ? Messages.ScriptSecurity_ScriptApprovalWarning() : "";
     }
 
     @Initializer(before = InitMilestone.PLUGINS_STARTED)
@@ -126,12 +126,12 @@ public static void addAliases() {
     }
 
     public boolean isSecurityEnabled() {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
         return jenkins.isUseSecurity() && jenkins.getDescriptorByType(GlobalJobDslSecurityConfiguration.class).isUseScriptSecurity();
     }
 
     private static void removeSeedReference(String key) {
-        DescriptorImpl descriptor = Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
+        DescriptorImpl descriptor = Jenkins.get().getDescriptorByType(DescriptorImpl.class);
         SeedReference seedReference = descriptor.getGeneratedJobMap().remove(key);
         if (seedReference != null) {
             descriptor.save();

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/EmbeddedApiDocGenerator.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/EmbeddedApiDocGenerator.groovy
@@ -165,7 +165,7 @@ class EmbeddedApiDocGenerator {
                 .element('parameters', generateParameters(method))
                 .element('extension', true)
 
-        PluginWrapper plugin = Jenkins.instance.pluginManager.whichPlugin(method.declaringClass)
+        PluginWrapper plugin = Jenkins.get().pluginManager.whichPlugin(method.declaringClass)
         if (plugin) {
             signature.element('plugin', [id: plugin.shortName])
         }
@@ -216,7 +216,7 @@ class EmbeddedApiDocGenerator {
 
         generateHelp(signature, model.help)
 
-        PluginWrapper plugin = Jenkins.instance.pluginManager.whichPlugin(model.type)
+        PluginWrapper plugin = Jenkins.get().pluginManager.whichPlugin(model.type)
         if (plugin) {
             signature.element('plugin', [id: plugin.shortName])
         }

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ExecuteDslScripts.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ExecuteDslScripts.java
@@ -381,7 +381,7 @@ private Set<String> updateTemplates(Job seedJob, TaskListener listener,
 
         // Collect information about the templates we loaded
         final String seedJobName = seedJob.getName();
-        DescriptorImpl descriptor = Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
+        DescriptorImpl descriptor = Jenkins.get().getDescriptorByType(DescriptorImpl.class);
         boolean descriptorMutated = false;
 
         // Clean up
@@ -466,7 +466,7 @@ private void updateGeneratedJobs(final Job seedJob, TaskListener listener,
 
     private void updateGeneratedJobMap(Job seedJob, Set<GeneratedJob> createdOrUpdatedJobs,
                                        Set<GeneratedJob> removedJobs) throws IOException {
-        DescriptorImpl descriptor = Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
+        DescriptorImpl descriptor = Jenkins.get().getDescriptorByType(DescriptorImpl.class);
         boolean descriptorMutated = false;
         Map<String, SeedReference> generatedJobMap = descriptor.getGeneratedJobMap();
 
@@ -549,10 +549,10 @@ private void updateGeneratedConfigFiles(Job seedJob, TaskListener listener,
         logItems(listener, "Existing config files", existing);
         logItems(listener, "Unreferenced config files", unreferenced);
 
-        if (removedConfigFilesAction == RemovedConfigFilesAction.DELETE && Jenkins.getInstance().getPluginManager().getPlugin("config-file-provider") != null) {
+        if (removedConfigFilesAction == RemovedConfigFilesAction.DELETE && Jenkins.get().getPluginManager().getPlugin("config-file-provider") != null) {
             GlobalConfigFiles globalConfigFiles = GlobalConfigFiles.get();
             for (GeneratedConfigFile unreferencedConfigFile : unreferenced) {
-                Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+                Jenkins.get().checkPermission(Jenkins.ADMINISTER);
                 globalConfigFiles.remove(unreferencedConfigFile.getId());
             }
         }

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/JenkinsDslScriptLoader.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/JenkinsDslScriptLoader.java
@@ -21,12 +21,12 @@ public JenkinsDslScriptLoader(JobManagement jobManagement) {
     protected void extractGeneratedItems(GeneratedItems generatedItems, JenkinsJobParent jobParent, ScriptRequest scriptRequest) {
         super.extractGeneratedItems(generatedItems, jobParent, scriptRequest);
 
-        if (Jenkins.getInstance().getPluginManager().getPlugin("config-file-provider") != null) {
+        if (Jenkins.get().getPluginManager().getPlugin("config-file-provider") != null) {
             GlobalConfigFiles globalConfigFiles = GlobalConfigFiles.get();
             for (Object o : jobParent.getReferencedConfigs()) {
                 Config config = (Config) o;
                 if (!(scriptRequest.getIgnoreExisting() && globalConfigFiles.getById(config.id) != null)) {
-                    Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+                    Jenkins.get().checkPermission(Jenkins.ADMINISTER);
                     globalConfigFiles.save(config);
                 }
                 generatedItems.getConfigFiles().add(new GeneratedConfigFile(config.id, config.name));

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/JenkinsJobManagement.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/JenkinsJobManagement.java
@@ -181,9 +181,9 @@ public void createOrUpdateView(String path, String config, boolean ignoreExistin
     @Override
     public void createOrUpdateUserContent(UserContent userContent, boolean ignoreExisting) {
         // As in git-userContent-plugin:
-        Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+        Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         try {
-            FilePath file = Jenkins.getInstance().getRootPath().child("userContent").child(userContent.getPath());
+            FilePath file = Jenkins.get().getRootPath().child("userContent").child(userContent.getPath());
             if (!(file.exists() && ignoreExisting)) {
                 file.getParent().mkdirs();
                 file.copyFrom(userContent.getContent());
@@ -236,7 +236,7 @@ public String readFileInWorkspace(String relLocation) throws IOException, Interr
 
     @Override
     public String readFileInWorkspace(String jobName, String relLocation) throws IOException, InterruptedException {
-        Item item = Jenkins.getInstance().getItemByFullName(jobName);
+        Item item = Jenkins.get().getItemByFullName(jobName);
         if (item instanceof AbstractProject) {
             item.checkPermission(Item.WORKSPACE);
             FilePath workspace = ((AbstractProject) item).getSomeWorkspace();
@@ -257,7 +257,7 @@ public String readFileInWorkspace(String jobName, String relLocation) throws IOE
 
     @Override
     public void logPluginDeprecationWarning(String pluginShortName, String minimumVersion) {
-        Plugin plugin = Jenkins.getInstance().getPlugin(pluginShortName);
+        Plugin plugin = Jenkins.get().getPlugin(pluginShortName);
         if (plugin != null && plugin.getWrapper().getVersionNumber().isOlderThan(new VersionNumber(minimumVersion))) {
             logDeprecationWarning(
                     "support for " + plugin.getWrapper().getDisplayName() + " versions older than " + minimumVersion
@@ -280,7 +280,7 @@ public void requirePlugin(String pluginShortName) {
 
     @Override
     public void requirePlugin(String pluginShortName, boolean failIfMissing) {
-        Plugin plugin = Jenkins.getInstance().getPlugin(pluginShortName);
+        Plugin plugin = Jenkins.get().getPlugin(pluginShortName);
         if (plugin == null) {
             failOrMarkBuildAsUnstable(
                     "plugin '" + pluginShortName + "' needs to be installed",
@@ -296,7 +296,7 @@ public void requireMinimumPluginVersion(String pluginShortName, String version)
 
     @Override
     public void requireMinimumPluginVersion(String pluginShortName, String version, boolean failIfMissing) {
-        Plugin plugin = Jenkins.getInstance().getPlugin(pluginShortName);
+        Plugin plugin = Jenkins.get().getPlugin(pluginShortName);
         if (plugin == null) {
             failOrMarkBuildAsUnstable(
                     "version " + version + " or later of plugin '" + pluginShortName + "' needs to be installed",
@@ -319,7 +319,7 @@ public void requireMinimumCoreVersion(String version) {
 
     @Override
     public boolean isMinimumPluginVersionInstalled(String pluginShortName, String version) {
-        Plugin plugin = Jenkins.getInstance().getPlugin(pluginShortName);
+        Plugin plugin = Jenkins.get().getPlugin(pluginShortName);
         return plugin != null && !plugin.getWrapper().getVersionNumber().isOlderThan(new VersionNumber(version));
     }
 
@@ -330,7 +330,7 @@ public boolean isMinimumCoreVersion(String version) {
 
     @Override
     public Integer getVSphereCloudHash(String name) {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
         if (jenkins.getPlugin("vsphere-cloud") != null) {
             for (Cloud cloud : jenkins.clouds) {
                 if (cloud instanceof vSphereCloud && ((vSphereCloud) cloud).getVsDescription().equals(name)) {
@@ -344,7 +344,7 @@ public Integer getVSphereCloudHash(String name) {
     @Override
     public void renameJobMatching(final String previousNames, String destination) throws IOException {
         final ItemGroup context = lookupStrategy.getContext(project);
-        Collection<Job> items = Jenkins.getInstance().getAllItems(Job.class);
+        Collection<Job> items = Jenkins.get().getAllItems(Job.class);
         Collection<Job> matchingJobs = Collections2.filter(items, new Predicate<Job>() {
             @Override
             public boolean apply(Job topLevelItem) {

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/LookupStrategy.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/LookupStrategy.java
@@ -16,7 +16,7 @@ public enum LookupStrategy {
     /**
      * Using this naming strategy jobs with relative path names are absolute names.
      */
-    JENKINS_ROOT("Jenkins Root", (seedJob) -> Jenkins.getInstance()),
+    JENKINS_ROOT("Jenkins Root", (seedJob) -> Jenkins.get()),
 
     /**
      * Using this naming strategy jobs with relative path names are created relative
@@ -44,7 +44,7 @@ public <T extends Item> T getItem(Item seedJob, String path, Class<T> type) {
         if (normalizePath == null) {
             return null;
         }
-        return Jenkins.getInstance().getItemByFullName(normalizePath, type);
+        return Jenkins.get().getItemByFullName(normalizePath, type);
     }
 
     /**
@@ -65,7 +65,7 @@ protected ItemGroup getContext(Item seedJob) {
      * @return parent {@link hudson.model.ItemGroup} of the item with the given path
      */
     public ItemGroup getParent(Item seedJob, String path) {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
 
         String absolutePath;
         if (path.startsWith("/")) {
@@ -91,7 +91,7 @@ public String getDisplayName() {
     private final Function<Item, ItemGroup> context;
 
     private static ItemGroup getItemGroup(String path) {
-        Jenkins instance = Jenkins.getInstance();
+        Jenkins instance = Jenkins.get();
         String normalizedPath = normalizePath(path);
         if (normalizedPath == null) {
             return null;

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/MonitorTemplateJobs.java b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/MonitorTemplateJobs.java
@@ -39,7 +39,7 @@ public void onChange(Saveable saveable, XmlFile file) {
         AbstractItem project = (AbstractItem) saveable;
         String possibleTemplateName = project.getName();
 
-        DescriptorImpl descriptor = Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
+        DescriptorImpl descriptor = Jenkins.get().getDescriptorByType(DescriptorImpl.class);
         Collection<SeedReference> seedJobReferences = descriptor.getTemplateJobMap().get(possibleTemplateName);
 
         if (seedJobReferences.isEmpty()) {
@@ -88,7 +88,7 @@ public int hashCode() {
     private static class LookupProjectFunction implements Function<SeedReference, BuildableItem> {
         @Override
         public BuildableItem apply(SeedReference input) {
-            return (BuildableItem) Jenkins.getInstance().getItem(input.getSeedJobName());
+            return (BuildableItem) Jenkins.get().getItem(input.getSeedJobName());
         }
     }
 }
diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/PermissionsHelper.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/PermissionsHelper.groovy
@@ -7,7 +7,7 @@ import jenkins.model.Jenkins
 class PermissionsHelper {
     static Set<String> getPermissions(String descriptorId) {
         Set<String> result = []
-        Descriptor descriptor = Jenkins.instance.getDescriptor(descriptorId)
+        Descriptor descriptor = Jenkins.get().getDescriptor(descriptorId)
         if (descriptor != null) {
             List<PermissionGroup> allGroups = descriptor.allGroups
             allGroups*.permissions.flatten().findAll { descriptor.showPermission(it) }.each {

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerActionFactory.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerActionFactory.groovy
@@ -18,6 +18,6 @@ class ApiViewerActionFactory extends TransientActionFactory<Project> {
 
     @Override
     Collection<? extends Action> createFor(@Nonnull Project target) {
-        target.buildersList.contains(Jenkins.instance.getDescriptor(ExecuteDslScripts)) ? [new ApiViewerAction()] : []
+        target.buildersList.contains(Jenkins.get().getDescriptor(ExecuteDslScripts)) ? [new ApiViewerAction()] : []
     }
 }
diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerRootAction.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerRootAction.groovy
@@ -53,7 +53,7 @@ class ApiViewerRootAction implements RootAction {
     }
 
     private CachedFile generatePlugins() {
-        Collection<UpdateSite> sites = Jenkins.instance.updateCenter.sites.findAll { it.JSONObject != null }
+        Collection<UpdateSite> sites = Jenkins.get().updateCenter.sites.findAll { it.JSONObject != null }
         long lastModified = sites*.dataTimestamp.max() ?: 0
         CachedFile updateCenter = cachedPlugins
         if (updateCenter == null || lastModified > updateCenter.timestamp) {
@@ -70,7 +70,7 @@ class ApiViewerRootAction implements RootAction {
             }
 
             // add plugins that are not available in the Update Center
-            jenkins.model.Jenkins.instance.pluginManager.plugins.each { PluginWrapper plugin ->
+            jenkins.model.Jenkins.get().pluginManager.plugins.each { PluginWrapper plugin ->
                 if (!plugins.containsKey(plugin.shortName)) {
                     JSONObject pluginJson = new JSONObject()
                     pluginJson.put('name', plugin.shortName)

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/SeedJobAction.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/SeedJobAction.groovy
@@ -21,12 +21,12 @@ class SeedJobAction implements Action {
     }
 
     Item getSeedJob() {
-        Jenkins.instance.getItemByFullName(seedReference.seedJobName)
+        Jenkins.get().getItemByFullName(seedReference.seedJobName)
     }
 
     Item getTemplateJob() {
         String templateJobName = seedReference.templateJobName
-        templateJobName == null ? null : Jenkins.instance.getItemByFullName(templateJobName)
+        templateJobName == null ? null : Jenkins.get().getItemByFullName(templateJobName)
     }
 
     String getDigest() {

diff --git a/...ugin/src/main/groovy/javaposse/jobdsl/plugin/actions/SeedJobTransientActionFactory.groovy b/...ugin/src/main/groovy/javaposse/jobdsl/plugin/actions/SeedJobTransientActionFactory.groovy
@@ -20,7 +20,7 @@ class SeedJobTransientActionFactory extends TransientActionFactory<Item> {
     @Nonnull
     @Override
     Collection<? extends Action> createFor(@Nonnull Item target) {
-        DescriptorImpl descriptor = Jenkins.instance.getDescriptorByType(DescriptorImpl)
+        DescriptorImpl descriptor = Jenkins.get().getDescriptorByType(DescriptorImpl)
         SeedReference seedReference = descriptor.generatedJobMap[target.fullName]
         seedReference != null ? [new SeedJobAction(target, seedReference)] : []
     }

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/structs/DescribableHelper.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/structs/DescribableHelper.groovy
@@ -157,7 +157,7 @@ class DescribableHelper {
     }
 
     private static Class getTypeForLookup(DescribableModel model) {
-        Describable.isAssignableFrom(model.type) ? Jenkins.instance.getDescriptor(model.type)?.class : model.type
+        Describable.isAssignableFrom(model.type) ? Jenkins.get().getDescriptor(model.type)?.class : model.type
     }
 
     private static List<Descriptor> getDescriptors(Class<?> contextType) {
@@ -168,9 +168,9 @@ class DescribableHelper {
 
         String className = contextTypeAnnotation.value()
         try {
-            ClassLoader classLoader = Jenkins.instance.pluginManager.uberClassLoader
+            ClassLoader classLoader = Jenkins.get().pluginManager.uberClassLoader
             Class<? extends Describable> type = classLoader.loadClass(className).asSubclass(Describable)
-            return Jenkins.instance.getDescriptorList(type)
+            return Jenkins.get().getDescriptorList(type)
         } catch (ClassNotFoundException ignore) {
             LOGGER.fine("can not get descriptors for '$className', class not found")
             return []

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/structs/DescribableListContext.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/structs/DescribableListContext.groovy
@@ -28,7 +28,7 @@ class DescribableListContext implements Context {
      */
     DescribableListContext(String type, JobManagement jobManagement) {
         this(
-                Jenkins.instance.getExtensionList(type).collect { Descriptor d -> DescribableModel.of(d.clazz) },
+                Jenkins.get().getExtensionList(type).collect { Descriptor d -> DescribableModel.of(d.clazz) },
                 jobManagement
         )
     }