PodTemplate’s copy constructor was incomplete (#608)

PodTemplate’s copy constructor was incomplete
jenkinsci · Oct 1, 2019 · 35c10f8 · 35c10f8
2 parents 464320a + cb9434b
commit 35c10f8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 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
@@ -39,8 +39,10 @@
 import hudson.model.Saveable;
 import hudson.model.labels.LabelAtom;
 import hudson.slaves.NodeProperty;
+import hudson.util.XStream2;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import java.io.StringReader;
 import jenkins.model.Jenkins;
 
 /**
@@ -158,26 +160,9 @@ public PodTemplate() {
     }
 
     public PodTemplate(PodTemplate from) {
-        this.setAnnotations(from.getAnnotations());
-        this.setContainers(from.getContainers());
-        this.setImagePullSecrets(from.getImagePullSecrets());
-        this.setInstanceCap(from.getInstanceCap());
-        this.setLabel(from.getLabel());
-        this.setName(from.getName());
-        this.setNamespace(from.getNamespace());
-        this.setInheritFrom(from.getInheritFrom());
-        this.setNodeSelector(from.getNodeSelector());
-        this.setNodeUsageMode(from.getNodeUsageMode());
-        this.setServiceAccount(from.getServiceAccount());
-        this.setSlaveConnectTimeout(from.getSlaveConnectTimeout());
-        this.setActiveDeadlineSeconds(from.getActiveDeadlineSeconds());
-        this.setVolumes(from.getVolumes());
-        this.setWorkspaceVolume(from.getWorkspaceVolume());
-        this.yaml = from.yaml;
-        this.setYamls(from.getYamls());
-        this.setShowRawYaml(from.isShowRawYaml());
-        this.setNodeProperties(from.getNodeProperties());
-        this.setPodRetention(from.getPodRetention());
+        XStream2 xs = new XStream2();
+        xs.unmarshal(XStream2.getDefaultDriver().createReader(new StringReader(xs.toXML(from))), this);
+        this.yamls = from.yamls;
     }
 
     @Deprecated
@@ -740,10 +725,6 @@ protected Object readResolve() {
             yamls = null;
         }
 
-        if (showRawYaml == null) {
-            showRawYaml = Boolean.TRUE;
-        }
-
         if (yamlMergeStrategy == null) {
             yamlMergeStrategy = YamlMergeStrategy.defaultStrategy();
         }

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateFilterTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateFilterTest.java
@@ -45,9 +45,7 @@ public void multipleFilters() {
         podtemplates.add(podTemplate);
         List<PodTemplate> result = PodTemplateFilter.applyAll(null, podtemplates, Label.get("label"));
         assertEquals(1, result.size());
-        List<String> yamls = result.get(0).getYamls();
-        assertEquals(2, yamls.size());
-        assertThat(yamls, Matchers.containsInAnyOrder("yaml1", "yaml2"));
+        assertThat(result.get(0).getYamls(), Matchers.containsInAnyOrder("yaml1", "yaml2"));
     }
 
     private static PodTemplate addYaml(@Nonnull PodTemplate podTemplate, String yaml) {

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateTest.java
@@ -1,10 +1,11 @@
 package org.csanchez.jenkins.plugins.kubernetes;
 
+import hudson.util.XStream2;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 public class PodTemplateTest {
     @Test
@@ -18,4 +19,16 @@ public void getYamlsExposesSingleYamlField() {
         podTemplate.setYaml(null);
         assertThat(podTemplate.getYamls(), empty());
     }
+
+    @Test
+    public void copyConstructor() throws Exception {
+        XStream2 xs = new XStream2();
+        PodTemplate pt = new PodTemplate();
+        assertEquals(xs.toXML(pt), xs.toXML(new PodTemplate(pt)));
+        pt.setActiveDeadlineSeconds(99);
+        assertEquals(xs.toXML(pt), xs.toXML(new PodTemplate(pt)));
+        pt.setIdleMinutes(99);
+        assertEquals(xs.toXML(pt), xs.toXML(new PodTemplate(pt)));
+    }
+
 }