Fix Spotbugs warnings

jenkinsci · Sep 12, 2024 · c699f39 · c699f39
1 parent 513ec33
commit c699f39
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 9 deletions.
diff --git a/...ain/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogAgentConfiguration.java b/...ain/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogAgentConfiguration.java
@@ -128,7 +128,11 @@ public Map<String, String> toEnvironmentVariables() {
 
     @Override
     public Descriptor<DatadogClientConfiguration> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogAgentConfiguration.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogAgentConfiguration.class);
     }
 
     @Extension

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java
@@ -113,7 +113,11 @@ public Map<String, String> toEnvironmentVariables() {
 
     @Override
     public Descriptor<DatadogClientConfiguration> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogApiConfiguration.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogApiConfiguration.class);
     }
 
     @Extension

diff --git a/...in/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogClientConfiguration.java b/...in/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogClientConfiguration.java
@@ -22,7 +22,11 @@ public abstract class DatadogClientConfiguration implements Describable<DatadogC
 
     public static abstract class DatadogClientConfigurationDescriptor extends Descriptor<DatadogClientConfiguration> {
         public static List<DatadogClientConfigurationDescriptor> all() {
-            List<DatadogClientConfigurationDescriptor> descriptors = Jenkins.getInstanceOrNull().getDescriptorList(DatadogClientConfiguration.class);
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins == null) {
+                throw new RuntimeException("Jenkins instance is null");
+            }
+            List<DatadogClientConfigurationDescriptor> descriptors = jenkins.getDescriptorList(DatadogClientConfiguration.class);
             List<DatadogClientConfigurationDescriptor> sortedDescriptors = new ArrayList<>(descriptors);
             sortedDescriptors.sort(Comparator.comparingInt(DatadogClientConfigurationDescriptor::getOrder));
             return sortedDescriptors;

diff --git a/...main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntake.java b/...main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntake.java
@@ -26,7 +26,11 @@ public abstract class DatadogIntake implements Describable<DatadogIntake>, Seria
 
     public static abstract class DatadogIntakeDescriptor extends Descriptor<DatadogIntake> {
         public static List<DatadogIntakeDescriptor> all() {
-            List<DatadogIntakeDescriptor> descriptors = Jenkins.getInstanceOrNull().getDescriptorList(DatadogIntake.class);
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins == null) {
+                throw new RuntimeException("Jenkins instance is null");
+            }
+            List<DatadogIntakeDescriptor> descriptors = jenkins.getDescriptorList(DatadogIntake.class);
             List<DatadogIntakeDescriptor> sortedDescriptors = new ArrayList<>(descriptors);
             sortedDescriptors.sort(Comparator.comparingInt(DatadogIntakeDescriptor::getOrder));
             return sortedDescriptors;

diff --git a/.../java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java b/.../java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java
@@ -47,7 +47,11 @@ public String getSiteName() {
 
     @Override
     public Descriptor<DatadogIntake> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogIntakeSite.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogIntakeSite.class);
     }
 
     @Extension

diff --git a/.../java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeUrls.java b/.../java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeUrls.java
@@ -82,7 +82,11 @@ public String getSiteName() {
 
     @Override
     public Descriptor<DatadogIntake> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogIntakeUrls.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogIntakeUrls.class);
     }
 
     @Extension

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogApiKey.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogApiKey.java
@@ -30,7 +30,11 @@ public abstract class DatadogApiKey implements Describable<DatadogApiKey>, Seria
 
     public static abstract class DatadogApiKeyDescriptor extends Descriptor<DatadogApiKey> {
         public static List<DatadogApiKeyDescriptor> all() {
-            List<DatadogApiKeyDescriptor> descriptors = Jenkins.getInstanceOrNull().getDescriptorList(DatadogApiKey.class);
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins == null) {
+                throw new RuntimeException("Jenkins instance is null");
+            }
+            List<DatadogApiKeyDescriptor> descriptors = jenkins.getDescriptorList(DatadogApiKey.class);
             List<DatadogApiKeyDescriptor> sortedDescriptors = new ArrayList<>(descriptors);
             sortedDescriptors.sort(Comparator.comparingInt(DatadogApiKeyDescriptor::getOrder));
             return sortedDescriptors;

diff --git a/...a/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java b/...a/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java
@@ -64,7 +64,11 @@ static StringCredentials getCredentialFromId(String credentialId) {
 
     @Override
     public Descriptor<DatadogApiKey> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogCredentialsApiKey.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogCredentialsApiKey.class);
     }
 
     @Extension

diff --git a/...ain/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java b/...ain/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java
@@ -35,7 +35,11 @@ public Secret getKey() {
 
     @Override
     public Descriptor<DatadogApiKey> getDescriptor() {
-        return Jenkins.getInstanceOrNull().getDescriptorOrDie(DatadogTextApiKey.class);
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
+        if (jenkins == null) {
+            throw new RuntimeException("Jenkins instance is null");
+        }
+        return jenkins.getDescriptorOrDie(DatadogTextApiKey.class);
     }
 
     @Extension