Fix findbugs issues

jenkinsci · Mar 7, 2018 · b460793 · b460793
1 parent b0037b6
commit b460793
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 31 deletions.
diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/CifsPublisherPlugin.java b/src/main/java/jenkins/plugins/publish_over_cifs/CifsPublisherPlugin.java
@@ -155,7 +155,7 @@ public String toString() {
     }
 
     public Descriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(Descriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(Descriptor.class);
     }
 
     public CifsHostConfiguration getConfiguration(final String name) {

diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/JenkinsHelper.java b/src/main/java/jenkins/plugins/publish_over_cifs/JenkinsHelper.java
diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsDefaults.java b/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsDefaults.java
@@ -29,7 +29,6 @@
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import jenkins.model.Jenkins;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 
 public abstract class CifsDefaults implements Describable<CifsDefaults>, ExtensionPoint, CifsOptions {
 

diff --git a/...in/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideInstanceConfigDefaults.java b/...in/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideInstanceConfigDefaults.java
@@ -29,7 +29,6 @@
 import hudson.model.Descriptor;
 import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.InstanceConfigOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CifsOverrideInstanceConfigDefaults implements InstanceConfigOptions, Describable<CifsOverrideInstanceConfigDefaults> {
@@ -59,7 +58,7 @@ public boolean isAlwaysPublishFromMaster() {
     }
 
     public CifsOverrideInstanceConfigDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverrideInstanceConfigDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverrideInstanceConfigDefaultsDescriptor.class);
     }
 
     @Extension

diff --git a/...main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideParamPublishDefaults.java b/...main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideParamPublishDefaults.java
@@ -27,8 +27,8 @@
 import hudson.Extension;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.ParamPublishOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CifsOverrideParamPublishDefaults implements ParamPublishOptions, Describable<CifsOverrideParamPublishDefaults> {
@@ -45,7 +45,7 @@ public String getParameterName() {
     }
 
     public CifsOverrideParamPublishDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverrideParamPublishDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverrideParamPublishDefaultsDescriptor.class);
     }
 
     @Extension

diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverridePublisherDefaults.java b/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverridePublisherDefaults.java
@@ -27,8 +27,8 @@
 import hudson.Extension;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.PublisherOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CifsOverridePublisherDefaults implements PublisherOptions, Describable<CifsOverridePublisherDefaults> {
@@ -64,7 +64,7 @@ public boolean isVerbose() {
     }
 
     public CifsOverridePublisherDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverridePublisherDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverridePublisherDefaultsDescriptor.class);
     }
 
     @Extension

diff --git a/...in/java/jenkins/plugins/publish_over_cifs/options/CifsOverridePublisherLabelDefaults.java b/...in/java/jenkins/plugins/publish_over_cifs/options/CifsOverridePublisherLabelDefaults.java
@@ -27,8 +27,8 @@
 import hudson.Extension;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.PublisherLabelOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CifsOverridePublisherLabelDefaults implements PublisherLabelOptions, Describable<CifsOverridePublisherLabelDefaults> {
@@ -45,7 +45,7 @@ public String getLabel() {
     }
 
     public CifsOverridePublisherLabelDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverridePublisherLabelDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverridePublisherLabelDefaultsDescriptor.class);
     }
 
     @Extension

diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideRetryDefaults.java b/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideRetryDefaults.java
@@ -30,7 +30,6 @@
 import hudson.util.FormValidation;
 import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.RetryOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
@@ -54,7 +53,7 @@ public long getRetryDelay() {
     }
 
     public CifsOverrideRetryDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverrideRetryDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverrideRetryDefaultsDescriptor.class);
     }
 
     @Extension

diff --git a/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideTransferDefaults.java b/src/main/java/jenkins/plugins/publish_over_cifs/options/CifsOverrideTransferDefaults.java
@@ -27,8 +27,8 @@
 import hudson.Extension;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.options.TransferOptions;
-import jenkins.plugins.publish_over_cifs.JenkinsHelper;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CifsOverrideTransferDefaults implements TransferOptions, Describable<CifsOverrideTransferDefaults> {
@@ -102,7 +102,7 @@ public String getPatternSeparator() {
     }
 
     public CifsOverrideTransferDefaultsDescriptor getDescriptor() {
-        return JenkinsHelper.getDescriptor(CifsOverrideTransferDefaultsDescriptor.class);
+        return Jenkins.getInstance().getDescriptorByType(CifsOverrideTransferDefaultsDescriptor.class);
     }
 
     @Extension