Fix getting Jenkins instance

jenkinsci · Feb 16, 2021 · 0f3a8a4 · 0f3a8a4
1 parent 76a6644
commit 0f3a8a4
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/ETPlugin.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/ETPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020 TraceTronic GmbH
+ * Copyright (c) 2015-2021 TraceTronic GmbH
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -82,8 +82,8 @@ public static String getIconFileName(final String iconClassName, final String ic
      */
     @Initializer(after = InitMilestone.PLUGINS_STARTED)
     public void syncATXConfiguration() {
-        final ATXInstallation.DescriptorImpl descriptor = Jenkins.getInstance()
-                .getDescriptorByType(ATXInstallation.DescriptorImpl.class);
+        final ATXInstallation.DescriptorImpl descriptor = Jenkins.get()
+            .getDescriptorByType(ATXInstallation.DescriptorImpl.class);
         if (descriptor != null) {
             descriptor.syncWithDefaultConfig();
             descriptor.save();

diff --git a/...java/de/tracetronic/jenkins/plugins/ecutest/report/atx/installation/ATXCustomSetting.java b/...java/de/tracetronic/jenkins/plugins/ecutest/report/atx/installation/ATXCustomSetting.java
@@ -46,7 +46,7 @@ public ATXCustomSetting(final String name) {
      * @return the descriptor extension list
      */
     public static DescriptorExtensionList<ATXCustomSetting, Descriptor<ATXCustomSetting>> all() {
-        return Jenkins.getInstance().getDescriptorList(ATXCustomSetting.class);
+        return Jenkins.get().getDescriptorList(ATXCustomSetting.class);
     }
 
     public String getName() {

diff --git a/.../java/de/tracetronic/jenkins/plugins/ecutest/report/atx/installation/ATXInstallation.java b/.../java/de/tracetronic/jenkins/plugins/ecutest/report/atx/installation/ATXInstallation.java
@@ -197,7 +197,7 @@ private void migrateFromOldConfigFile(final Class<ATXPublisher.DescriptorImpl> o
             stream.addCompatibilityAlias(oldClass.getName(), getClass());
 
             final XmlFile file = new XmlFile(stream,
-                    new File(Jenkins.getInstance().getRootDir(), oldClass.getEnclosingClass().getName() + ".xml"));
+                    new File(Jenkins.get().getRootDir(), oldClass.getEnclosingClass().getName() + ".xml"));
             if (file.exists()) {
                 try {
                     file.unmarshal(this);
@@ -418,7 +418,7 @@ public FormValidation doTestConnection(@QueryParameter final String serverURL,
                                                @QueryParameter final String httpProxy,
                                                @QueryParameter final String httpsProxy,
                                                @QueryParameter final boolean ignoreSSL) {
-            Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+            Jenkins.get().checkPermission(Jenkins.ADMINISTER);
             final String proxyUrl = useHttpsConnection ? httpsProxy : httpProxy;
             return atxValidator.testConnection(serverURL, serverPort, serverContextPath, useHttpsConnection,
                     proxyUrl, ignoreSSL);

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/pipeline/ATXServer.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/pipeline/ATXServer.java
@@ -116,9 +116,7 @@ public ATXSetting<?> getSetting(final String settingName) {
     @Whitelisted
     public Map<String, Object> getSettings() {
         final Map<String, Object> settings = new LinkedHashMap<>();
-        installation.getConfig().getSettings().forEach(setting -> {
-            settings.put(setting.getName(), setting.getValue());
-        });
+        installation.getConfig().getSettings().forEach(setting -> settings.put(setting.getName(), setting.getValue()));
         return settings;
     }
 

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/tms/TMSPublisher.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/report/tms/TMSPublisher.java
@@ -193,7 +193,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath final Item item,
                                                      @QueryParameter final String credentialsId) {
             final StandardListBoxModel result = new StandardListBoxModel();
             if (item == null) {
-                if (!Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER)) {
+                if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
                     return result.includeCurrentValue(credentialsId);
                 }
             } else {

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/client/AbstractTestClient.java
@@ -140,7 +140,7 @@ public void setAborted(final boolean isAborted) {
     protected boolean recordWarnings(final TestInfoHolder testInfo, final Run<?, ?> run, final FilePath workspace,
                                      final Launcher launcher, final TaskListener listener)
         throws IOException, InterruptedException {
-        final Plugin plugin = Jenkins.getInstance().getPlugin("warnings-ng");
+        final Plugin plugin = Jenkins.get().getPlugin("warnings-ng");
         if (plugin == null || !(plugin.getWrapper().isActive())) {
             final TTConsoleLogger logger = new TTConsoleLogger(listener);
             logger.logError("Warnings NG plugin not found or disabled, please install using the Update Center!");

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/config/TMSConfig.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/test/config/TMSConfig.java
@@ -65,7 +65,7 @@ public static int getDefaultTimeout() {
      * @return the descriptor extension list
      */
     public static DescriptorExtensionList<TMSConfig, Descriptor<TMSConfig>> all() {
-        return Jenkins.getInstance().getDescriptorList(TMSConfig.class);
+        return Jenkins.get().getDescriptorList(TMSConfig.class);
     }
 
     public String getCredentialsId() {
@@ -96,7 +96,7 @@ public StandardUsernamePasswordCredentials getCredentials(final Item project) {
 
     @Override
     public DescriptorImpl getDescriptor() {
-        return (DescriptorImpl) Jenkins.getInstance().getDescriptor(getClass());
+        return (DescriptorImpl) Jenkins.get().getDescriptor(getClass());
     }
 
     /**
@@ -134,7 +134,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath final Item item,
                                                      @QueryParameter final String credentialsId) {
             final StandardListBoxModel result = new StandardListBoxModel();
             if (item == null) {
-                if (!Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER)) {
+                if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
                     return result.includeCurrentValue(credentialsId);
                 }
             } else {

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/tool/installation/ETInstallation.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/tool/installation/ETInstallation.java
@@ -384,7 +384,7 @@ private void migrateFromOldConfigFile(final Class oldClass) {
             stream.addCompatibilityAlias(oldClass.getName(), getClass());
 
             final XmlFile file = new XmlFile(stream,
-                    new File(Jenkins.getInstance().getRootDir(), oldClass.getEnclosingClass().getName() + ".xml"));
+                    new File(Jenkins.get().getRootDir(), oldClass.getEnclosingClass().getName() + ".xml"));
             if (file.exists()) {
                 try {
                     file.unmarshal(this);
@@ -441,7 +441,7 @@ public ETInstallation getInstallation(final String name) {
 
         @Override
         public FormValidation doCheckHome(@QueryParameter final File value) {
-            Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+            Jenkins.get().checkPermission(Jenkins.ADMINISTER);
             FormValidation returnValue = FormValidation.ok();
             if (!Functions.isWindows()) {
                 returnValue = FormValidation.warning(Messages.ETInstallation_IsUnixSystem());

diff --git a/src/main/java/de/tracetronic/jenkins/plugins/ecutest/tool/installation/ETToolProperty.java b/src/main/java/de/tracetronic/jenkins/plugins/ecutest/tool/installation/ETToolProperty.java
@@ -100,7 +100,7 @@ public static int getDefaultTimeout() {
          * @return the form validation
          */
         public FormValidation doCheckProgId(@QueryParameter final String value) {
-            Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+            Jenkins.get().checkPermission(Jenkins.ADMINISTER);
             FormValidation returnValue = FormValidation.ok();
             if (!StringUtils.isEmpty(value)) {
                 final String pattern = "^(ECU-TEST\\.Application(\\.\\d+.\\d+)?|ECU-TEST6?\\.Application)";