Support extended-choice-parameter JSON parameter

Author: res0nance

pom.xml

@@ -84,6 +84,12 @@
 			<artifactId>pipeline-model-definition</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jenkins-ci.plugins</groupId>
+			<artifactId>extended-choice-parameter</artifactId>
+			<version>0.82</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>

src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedTimerTrigger.java

@@ -18,6 +18,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.kohsuke.stapler.DataBoundConstructor;
 
@@ -64,9 +65,23 @@ private List<ParameterValue> configurePropertyValues(Map<String, String> paramet
 			if (parameterValues.containsKey(paramDefinition.getName())) {
 				ParameterizedStaplerRequest request = new ParameterizedStaplerRequest(
 						parameterValues.get(paramDefinition.getName()));
-				defValues.add(paramDefinition.createValue(request));
-			} else if (defaultValue != null)
+				ParameterValue value;
+				if (paramDefinition.getClass().getName().equals("com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition") &&
+						paramDefinition.getType().equals("PT_JSON")) {
+					JSONObject jO = new JSONObject();
+					jO.put("value", parameterValues.get(paramDefinition.getName()));
+					value = paramDefinition.createValue(request, jO);
+				} else {
+					value = paramDefinition.createValue(request);
+				}
+				if (value!= null) {
+					defValues.add(value);
+				} else {
+					LOGGER.warning("Cannot create value for " + paramDefinition.getName());
+				}
+			} else if (defaultValue != null) {
 				defValues.add(defaultValue);
+			}
 		}
 
 		return defValues;

src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedSchedulerTest.java

@@ -1,17 +1,26 @@
 package org.jenkinsci.plugins.parameterizedscheduler;
 
+import com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition;
 import hudson.model.FreeStyleProject;
 import hudson.model.Job;
+import hudson.model.ParameterDefinition;
+import hudson.model.ParameterValue;
 import hudson.model.ParametersAction;
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.StringParameterDefinition;
 import hudson.triggers.Trigger;
+import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.kohsuke.stapler.StaplerRequest;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -97,4 +106,63 @@ public void declarative() throws Exception {
         assertThat(p.getLastCompletedBuild(), is(not(wfr)));
         assertThat((String) p.getLastCompletedBuild().getAction(ParametersAction.class).getParameter("foo").getValue(), is("bar"));
     }
+
+    @Test
+    @Issue("JENKINS-49372")
+    public void extendedChoiceJson() throws Exception {
+        FreeStyleProject p = r.createFreeStyleProject();
+        p.addProperty(new ParametersDefinitionProperty(new ExtendedChoiceParameterDefinition("foo", ExtendedChoiceParameterDefinition.PARAMETER_TYPE_JSON, "",
+                "", "", "def jsonSlurper = new groovy.json.JsonSlurper()\n" +
+                "def object = jsonSlurper.parseText('{\"schema\":{\"type\":\"object\",\"title\":\"Car\",\"properties\":{\"make\":{\"type\":\"string\",\"enum\":[\"Toyota\",\"BMW\",\"Honda\",\"Ford\",\"Chevy\",\"VW\"]},\"model\":{\"type\":\"string\"},\"year\":{\"type\":\"integer\",\"enum\":[1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014],\"default\":2008}}}}')\n" +
+                "return object", "", "", "", "",
+        "", "", "" , "", "", "",
+                "", "", "", "", "", "",
+        "", "", "", "", false, false,
+                0, "", "")));
+        assertThat(p.getLastCompletedBuild(), is(nullValue()));
+        Trigger<Job> t = new ParameterizedTimerTrigger("* * * * *%foo={\"make\":\"Toyota\",\"model\":\"test\",\"year\":2008}");
+        t.start(p, true);
+        p.addTrigger(t);
+        new Cron().doRun();
+        assertThat(p.isInQueue(), is(true));
+        r.waitUntilNoActivity();
+        // Build should complete successfully but will not have any value
+        assertThat(p.getLastCompletedBuild(), is(notNullValue()));
+        assertThat(p.getLastCompletedBuild().getAction(ParametersAction.class).getParameter("foo").getValue(), is("{\"make\":\"Toyota\",\"model\":\"test\",\"year\":2008}"));
+    }
+
+    @Test
+    @Issue("JENKINS-49372")
+    public void nullValueCreated() throws Exception {
+        FreeStyleProject p = r.createFreeStyleProject();
+        p.addProperty(new ParametersDefinitionProperty(new NullParameterDefinition("foo")));
+        assertThat(p.getLastCompletedBuild(), is(nullValue()));
+        Trigger<Job> t = new ParameterizedTimerTrigger("* * * * *%foo=test");
+        t.start(p, true);
+        p.addTrigger(t);
+        new Cron().doRun();
+        assertThat(p.isInQueue(), is(true));
+        r.waitUntilNoActivity();
+        // Build should complete successfully but will not have any value
+        assertThat(p.getLastCompletedBuild(), is(notNullValue()));
+    }
+
+    private static class NullParameterDefinition extends ParameterDefinition {
+
+        public NullParameterDefinition(@Nonnull String name) {
+            super(name, null);
+        }
+
+        @CheckForNull
+        @Override
+        public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject jsonObject) {
+            return null;
+        }
+
+        @CheckForNull
+        @Override
+        public ParameterValue createValue(StaplerRequest staplerRequest) {
+            return null;
+        }
+    }
 }