Add support to allow user to set useJsonJobParameters for job relaunch via the shell.

Note: there are not tests for the shell update in this commit. This is because the current
set of tests rely on @EnableDataflowServer which does not work.   But before we fix
@EnableDataflowServer we need to make sure we want to carry it forward per Issue spring-cloud#1040

Author: cppwfs

spring-cloud-dataflow-rest-client/src/main/java/org/springframework/cloud/dataflow/rest/client/JobOperations.java

@@ -42,6 +42,16 @@ public interface JobOperations {
 	 */
 	void executionRestart(long id);
 
+	/**
+	 * Restarts a job by id
+	 *
+	 * @param id           job execution id
+	 * @param useJsonJobParameters if true {@link org.springframework.batch.core.JobParameters} will be serialized to JSON.
+	 *                             Default is {@code Null} which will serialize the {@link org.springframework.batch.core.JobParameters}
+	 *                             to the default specified in SCDF's configuration.
+	 */
+	void executionRestart(long id, Boolean useJsonJobParameters);
+
 	/**
 	 * @return the list job executions without step executions known to the system.
 	 */

spring-cloud-dataflow-rest-client/src/main/java/org/springframework/cloud/dataflow/rest/client/JobTemplate.java

@@ -117,6 +117,14 @@ public void executionRestart(long id) {
 		restTemplate.put(builder.toUriString(), null);
 	}
 
+	@Override
+	public void executionRestart(long id, Boolean useJsonJobParameters) {
+		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(executionLink.expand(id).getHref()).queryParam("restart", "true")
+			.queryParam("useJsonJobParameters", useJsonJobParameters);
+
+		restTemplate.put(builder.toUriString(), null);
+	}
+
 	@Override
 	public PagedModel<JobExecutionThinResource> executionThinList() {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(thinExecutionsLink.getHref()).queryParam("size", "2000");

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/command/JobCommands.java

@@ -107,8 +107,17 @@ public Table executionList(
 	@ShellMethod(key = EXECUTION_RESTART, value = "Restart a failed job by jobExecutionId")
 	@ShellMethodAvailability("availableWithViewRole")
 	public String executionRestart(
-			@ShellOption(help = "the job execution id") long id) {
-		jobOperations().executionRestart(id);
+			@ShellOption(help = "the job executiond id") long id,
+			@ShellOption(value = "--useJsonJobParameters",
+				help = "boolean value serialize job parameter as Json.  " +
+					"Default is null, meaning SCDF default will be used.",
+				defaultValue = ShellOption.NULL) String useJsonJobParameters) {
+		if(useJsonJobParameters == null) {
+			jobOperations().executionRestart(id);
+		}
+		else {
+			jobOperations().executionRestart(id, Boolean.valueOf(useJsonJobParameters));
+		}
 		return String.format("Restart request has been sent for job execution '%s'", id);
 	}