Merge pull request #201 from KostyaSha/upstream-master

Make DockerJobProperty optional
jenkinsci · Apr 9, 2015 · 824c92a · 824c92a
2 parents 5483fee + f24b1c4
commit 824c92a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/docker-plugin/src/main/java/com/nirima/jenkins/plugins/docker/DockerJobProperty.java b/docker-plugin/src/main/java/com/nirima/jenkins/plugins/docker/DockerJobProperty.java
@@ -1,22 +1,17 @@
 package com.nirima.jenkins.plugins.docker;
 
 import hudson.Extension;
-import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
-import hudson.model.Descriptor;
 import hudson.model.Job;
+import hudson.model.JobProperty;
 import hudson.model.JobPropertyDescriptor;
-import hudson.tasks.Publisher;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.Exported;
 
-import java.util.Map;
 
-
-public class DockerJobProperty extends hudson.model.JobProperty<AbstractProject<?, ?>> {
+public class DockerJobProperty extends JobProperty<AbstractProject<?, ?>> {
 
     /**
      * Tag on completion (commit).
@@ -70,12 +65,16 @@ public boolean isApplicable(Class<? extends Job> jobType) {
         }
 
         @Override
-        public DockerJobProperty newInstance(StaplerRequest sr, JSONObject formData) throws hudson.model.Descriptor.FormException {
-            return new DockerJobProperty(
-                    (Boolean)formData.get("tagOnCompletion"),
-                    (String)formData.get("additionalTag"),
-                    (Boolean)formData.get("pushOnSuccess"),
-                    (Boolean)formData.get("cleanImages"));
+        public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            DockerJobProperty dockerJobProperty;
+
+            if (req.hasParameter("hasDockerContainer")) {
+                dockerJobProperty = req.bindJSON(DockerJobProperty.class, formData);
+            } else {
+                dockerJobProperty = null;
+            }
+
+            return dockerJobProperty;
         }
     }
-}
+}
diff --git a/docker-plugin/src/main/java/com/nirima/jenkins/plugins/docker/utils/PortUtils.java b/docker-plugin/src/main/java/com/nirima/jenkins/plugins/docker/utils/PortUtils.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,13 +54,13 @@ public static Map<String, List<Integer>> parsePorts(String waitPorts) throws Ill
         for (String container : containerPorts) {
             String[] idPorts = container.split(" ", 2);
             if (idPorts.length < 2)
-                throw new IllegalArgumentException("Cannot parse " + idPorts + " as '[conainerId] [port1],[port2],...'");
+                throw new IllegalArgumentException("Cannot parse " + Arrays.toString(idPorts) + " as '[conainerId] [port1],[port2],...'");
             String containerId = idPorts[0].trim();
             String portsStr = idPorts[1].trim();
 
             List<Integer> ports = new ArrayList<Integer>();
             for (String port : portsStr.split(",")) {
-                ports.add(new Integer(port));
+                ports.add(Integer.valueOf(port));
             }
             containers.put(containerId, ports);
         }

diff --git a/...lugin/src/main/resources/com/nirima/jenkins/plugins/docker/DockerJobProperty/config.jelly b/...lugin/src/main/resources/com/nirima/jenkins/plugins/docker/DockerJobProperty/config.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
-    <f:section title="Docker Container">
+    <f:optionalBlock title="Docker Container" name="hasDockerContainer" inline="true" checked="${instance!=null}" >
         <f:entry title="${%Commit on successful build}" field="tagOnCompletion">
             <f:checkbox default="false"/>
         </f:entry>
@@ -17,6 +17,6 @@
         <f:entry title="${%Clean local images}" field="cleanImages">
             <f:checkbox default="true"/>
         </f:entry>
-    </f:section>
+    </f:optionalBlock>
 
-</j:jelly>
+</j:jelly>