Merge remote-tracking branch 'origin/master' into JENKINS-57116

jenkinsci · May 2, 2019 · a8dfc40 · a8dfc40
2 parents 1063e6b + c0a7ccb
commit a8dfc40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.42</version>
+    <version>3.43</version>
   </parent>
 
   <groupId>org.csanchez.jenkins.plugins</groupId>

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java
@@ -27,7 +27,6 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.AbstractDescribableImpl;
@@ -128,7 +127,7 @@ public class PodTemplate extends AbstractDescribableImpl<PodTemplate> implements
     @Deprecated
     private transient String yaml;
 
-    private List<String> yamls;
+    private List<String> yamls = new ArrayList<>();
 
     @CheckForNull
     private PodRetention podRetention = PodRetention.getPodTemplateDefault();
@@ -512,7 +511,7 @@ public void setNodeProperties(List<? extends NodeProperty<?>> properties)  {
         this.getNodeProperties().addAll(properties);
     }
 
-    @NonNull
+    @Nonnull
     public PodTemplateToolLocation getNodeProperties(){
         if( this.nodeProperties == null)
             this.nodeProperties = new PodTemplateToolLocation(this);
@@ -619,7 +618,7 @@ public List<ContainerTemplate> getContainers() {
      */
     @Restricted(NoExternalUse.class) // Tests and UI
     public String getYaml() {
-        return yamls.isEmpty() ? null : yamls.get(0);
+        return yamls == null || yamls.isEmpty() ? null : yamls.get(0);
     }
 
     @DataBoundSetter
@@ -632,6 +631,7 @@ public void setYaml(String yaml) {
         }
     }
 
+    @Nonnull
     public List<String> getYamls() {
         if (yamls ==null) {
             return Collections.emptyList();