Follow-up JENKINS-72112; Spotbugs annotations (#1522)

jenkinsci · Mar 15, 2024 · ce87cec · ce87cec
1 parent a1647c2
commit ce87cec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
@@ -191,16 +191,18 @@ public String getId() {
         return id;
     }
 
+    @CheckForNull
     public YamlMergeStrategy getYamlMergeStrategy() {
         return yamlMergeStrategy;
     }
 
+    @NonNull
     public YamlMergeStrategy getResolvedYamlMergeStrategy() {
-        return getYamlMergeStrategy() != null ? getYamlMergeStrategy() : YamlMergeStrategy.defaultStrategy();
+        return Optional.ofNullable(getYamlMergeStrategy()).orElse(YamlMergeStrategy.defaultStrategy());
     }
 
     @DataBoundSetter
-    public void setYamlMergeStrategy(YamlMergeStrategy yamlMergeStrategy) {
+    public void setYamlMergeStrategy(@CheckForNull YamlMergeStrategy yamlMergeStrategy) {
         this.yamlMergeStrategy = yamlMergeStrategy;
     }
 
@@ -210,6 +212,7 @@ public Pod getYamlsPod() {
         return getResolvedYamlMergeStrategy().merge(getYamls());
     }
 
+    @CheckForNull
     private Boolean inheritYamlMergeStrategy;
 
     private Boolean showRawYaml;
@@ -990,12 +993,12 @@ public String getDescriptionForLogging() {
     }
 
     public boolean isInheritYamlMergeStrategy() {
-        return inheritYamlMergeStrategy != null ? inheritYamlMergeStrategy.booleanValue() : false;
+        return Optional.ofNullable(inheritYamlMergeStrategy).orElse(false);
     }
 
     @DataBoundSetter
     public void setInheritYamlMergeStrategy(boolean inheritYamlMergeStrategy) {
-        this.inheritYamlMergeStrategy = Boolean.valueOf(inheritYamlMergeStrategy);
+        this.inheritYamlMergeStrategy = inheritYamlMergeStrategy;
     }
 
     boolean isShowRawYamlSet() {

diff --git a/...ain/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgent.java b/...ain/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgent.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -91,6 +92,7 @@ public class KubernetesDeclarativeAgent extends RetryableDeclarativeAgent<Kubern
 
     private YamlMergeStrategy yamlMergeStrategy;
 
+    @CheckForNull
     private Boolean inheritYamlMergeStrategy;
 
     @CheckForNull
@@ -319,12 +321,12 @@ public void setYamlMergeStrategy(YamlMergeStrategy yamlMergeStrategy) {
     }
 
     public boolean isInheritYamlMergeStrategy() {
-        return inheritYamlMergeStrategy != null ? inheritYamlMergeStrategy.booleanValue() : false;
+        return Optional.ofNullable(inheritYamlMergeStrategy).orElse(false);
     }
 
     @DataBoundSetter
     public void setInheritYamlMergeStrategy(boolean inheritYamlMergeStrategy) {
-        this.inheritYamlMergeStrategy = Boolean.valueOf(inheritYamlMergeStrategy);
+        this.inheritYamlMergeStrategy = inheritYamlMergeStrategy;
     }
 
     public WorkspaceVolume getWorkspaceVolume() {

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStep.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStep.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import jenkins.model.Jenkins;
@@ -88,6 +89,7 @@ public class PodTemplateStep extends Step implements Serializable {
 
     private YamlMergeStrategy yamlMergeStrategy;
 
+    @CheckForNull
     private Boolean inheritYamlMergeStrategy;
 
     @CheckForNull
@@ -364,12 +366,12 @@ public void setPodRetention(@CheckForNull PodRetention podRetention) {
     }
 
     public boolean isInheritYamlMergeStrategy() {
-        return inheritYamlMergeStrategy != null ? inheritYamlMergeStrategy.booleanValue() : false;
+        return Optional.ofNullable(inheritYamlMergeStrategy).orElse(false);
     }
 
     @DataBoundSetter
     public void setInheritYamlMergeStrategy(boolean inheritYamlMergeStrategy) {
-        this.inheritYamlMergeStrategy = Boolean.valueOf(inheritYamlMergeStrategy);
+        this.inheritYamlMergeStrategy = inheritYamlMergeStrategy;
     }
 
     boolean isShowRawYamlSet() {

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/YamlMergeStrategy.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/yaml/YamlMergeStrategy.java
@@ -9,6 +9,7 @@
 
 public abstract class YamlMergeStrategy extends AbstractDescribableImpl<YamlMergeStrategy>
         implements ExtensionPoint, Serializable {
+    @NonNull
     public static YamlMergeStrategy defaultStrategy() {
         return new Overrides();
     }