From f1dbc1cbdc1c63e477423fdefbb4f5575c0690ac Mon Sep 17 00:00:00 2001
From: Jefferson Girao <jefferson.girao@klarna.com>
Date: Fri, 9 Dec 2016 17:35:41 +0100
Subject: [PATCH] Fixing checkbox serialization by jelly views

---
 .../plugins/kubernetes/ContainerTemplate.java  | 18 +++++++++---------
 .../plugins/kubernetes/KubernetesCloud.java    |  2 +-
 .../plugins/kubernetes/PodTemplateUtils.java   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java
index bb01f642ab..da0205f389 100644
--- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java
+++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java
@@ -21,9 +21,9 @@ public class ContainerTemplate extends AbstractDescribableImpl<ContainerTemplate
 
     private String image;
 
-    private Boolean privileged;
+    private boolean privileged;
 
-    private Boolean alwaysPullImage;
+    private boolean alwaysPullImage;
 
     private String workingDir = DEFAULT_WORKING_DIR;
 
@@ -31,7 +31,7 @@ public class ContainerTemplate extends AbstractDescribableImpl<ContainerTemplate
 
     private String args;
 
-    private Boolean ttyEnabled;
+    private boolean ttyEnabled;
 
     private String resourceRequestCpu;
 
@@ -99,11 +99,11 @@ public String getArgs() {
     }
 
     @DataBoundSetter
-    public void setTtyEnabled(Boolean ttyEnabled) {
+    public void setTtyEnabled(boolean ttyEnabled) {
         this.ttyEnabled = ttyEnabled;
     }
 
-    public Boolean isTtyEnabled() {
+    public boolean isTtyEnabled() {
         return ttyEnabled;
     }
 
@@ -121,20 +121,20 @@ public String getWorkingDir() {
     }
 
     @DataBoundSetter
-    public void setPrivileged(Boolean privileged) {
+    public void setPrivileged(boolean privileged) {
         this.privileged = privileged;
     }
 
-    public Boolean isPrivileged() {
+    public boolean isPrivileged() {
         return privileged;
     }
 
     @DataBoundSetter
-    public void setAlwaysPullImage(Boolean alwaysPullImage) {
+    public void setAlwaysPullImage(boolean alwaysPullImage) {
         this.alwaysPullImage = alwaysPullImage;
     }
 
-    public Boolean isAlwaysPullImage() {
+    public boolean isAlwaysPullImage() {
         return alwaysPullImage;
     }
 
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
index 3f78130d80..3be0649457 100644
--- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
+++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -353,7 +353,7 @@ private Container createContainer(KubernetesSlave slave, ContainerTemplate conta
         return new ContainerBuilder()
                 .withName(substituteEnv(containerTemplate.getName()))
                 .withImage(substituteEnv(containerTemplate.getImage()))
-                .withImagePullPolicy(containerTemplate.isAlwaysPullImage() != null && containerTemplate.isAlwaysPullImage() ? "Always" : "IfNotPresent")
+                .withImagePullPolicy(containerTemplate.isAlwaysPullImage() ? "Always" : "IfNotPresent")
                 .withNewSecurityContext()
                     .withPrivileged(containerTemplate.isPrivileged())
                 .endSecurityContext()
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateUtils.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateUtils.java
index 5cb5b983c1..7558cd168f 100644
--- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateUtils.java
+++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateUtils.java
@@ -43,12 +43,12 @@ public static ContainerTemplate combine(ContainerTemplate parent, ContainerTempl
 
         String name = template.getName();
         String image = Strings.isNullOrEmpty(template.getImage()) ? parent.getImage() : template.getImage();
-        Boolean privileged = template.isPrivileged() != null ? template.isPrivileged() : (parent.isPrivileged() != null ? parent.isPrivileged() : false);
-        Boolean alwaysPullImage = template.isAlwaysPullImage() != null ? template.isAlwaysPullImage() : (parent.isAlwaysPullImage() != null ? parent.isAlwaysPullImage() : false);
+        boolean privileged = template.isPrivileged() ? template.isPrivileged() : (parent.isPrivileged() ? parent.isPrivileged() : false);
+        boolean alwaysPullImage = template.isAlwaysPullImage() ? template.isAlwaysPullImage() : (parent.isAlwaysPullImage() ? parent.isAlwaysPullImage() : false);
         String workingDir = Strings.isNullOrEmpty(template.getWorkingDir()) ? (Strings.isNullOrEmpty(parent.getWorkingDir()) ? DEFAULT_WORKING_DIR : parent.getWorkingDir()) : template.getCommand();
         String command = Strings.isNullOrEmpty(template.getCommand()) ? parent.getCommand() : template.getCommand();
         String args = Strings.isNullOrEmpty(template.getArgs()) ? parent.getArgs() : template.getArgs();
-        Boolean ttyEnabled = template.isTtyEnabled() != null ? template.isTtyEnabled() : (parent.isTtyEnabled() != null ? parent.isTtyEnabled() : false);;
+        boolean ttyEnabled = template.isTtyEnabled() ? template.isTtyEnabled() : (parent.isTtyEnabled() ? parent.isTtyEnabled() : false);;
         String resourceRequestCpu = Strings.isNullOrEmpty(template.getResourceRequestCpu()) ? parent.getResourceRequestCpu() : template.getResourceRequestCpu();
         String resourceRequestMemory = Strings.isNullOrEmpty(template.getResourceRequestMemory()) ? parent.getResourceRequestMemory() : template.getResourceRequestMemory();
         String resourceLimitCpu = Strings.isNullOrEmpty(template.getResourceLimitCpu()) ? parent.getResourceLimitCpu() : template.getResourceLimitCpu();