Process given values is a parser

- Modify CommandParser to convert given option value if its type is defined
- This change makes option default value to behave same as given value
  what comes for the actual value in a CommandContext.
- Fixes #548

Author: jvalkeal

spring-shell-core/src/main/java/org/springframework/shell/command/CommandParser.java

@@ -323,6 +323,11 @@ ParserResults visit(List<List<String>> lexerResults, List<CommandOption> options
 								List<String> subArgs = lr.subList(1, lr.size());
 								ConvertArgumentsHolder holder = convertArguments(o, subArgs);
 								Object value = holder.value;
+								if (conversionService != null && o.getType() != null && value != null) {
+									if (conversionService.canConvert(value.getClass(), o.getType().getRawClass())) {
+										value = conversionService.convert(value, o.getType().getRawClass());
+									}
+								}
 								Stream<ParserResult> unmapped = holder.unmapped.stream()
 									.map(um -> ParserResult.of(null, Arrays.asList(um), null, null));
 								Stream<ParserResult> res = Stream.of(ParserResult.of(o, subArgs, value, null));
@@ -341,7 +346,7 @@ ParserResults visit(List<List<String>> lexerResults, List<CommandOption> options
 							defaultValueOptionsToCheck.remove(pr.option);
 						}
 					});
-					defaultValueOptionsToCheck.stream()
+				defaultValueOptionsToCheck.stream()
 					.filter(co -> co.getDefaultValue() != null)
 					.forEach(co -> {
 						Object value = co.getDefaultValue();

spring-shell-core/src/test/java/org/springframework/shell/command/CommandParserTests.java

@@ -292,7 +292,7 @@ public void testLongOptionsWithArray() {
 		CommandParserResults results = parser.parse(options, args);
 		assertThat(results.results()).hasSize(1);
 		assertThat(results.results().get(0).option()).isSameAs(option1);
-		assertThat(results.results().get(0).value()).isEqualTo(new String[] { "1", "2" });
+		assertThat(results.results().get(0).value()).isEqualTo(new int[] { 1, 2 });
 	}
 
 	@Test
@@ -337,6 +337,34 @@ public void testBooleanWithDefault() {
 		assertThat(results.results().get(0).value()).isEqualTo(true);
 	}
 
+	@Test
+	public void testIntegerWithDefault() {
+		ResolvableType type = ResolvableType.forType(Integer.class);
+		CommandOption option1 = CommandOption.of(new String[] { "arg1" }, new Character[0], "description", type, false,
+				"1", null, null, null, null, null);
+
+		List<CommandOption> options = Arrays.asList(option1);
+		String[] args = new String[]{};
+		CommandParserResults results = parser.parse(options, args);
+		assertThat(results.results()).hasSize(1);
+		assertThat(results.results().get(0).option()).isSameAs(option1);
+		assertThat(results.results().get(0).value()).isEqualTo(1);
+	}
+
+	@Test
+	public void testIntegerWithGivenValue() {
+		ResolvableType type = ResolvableType.forType(Integer.class);
+		CommandOption option1 = CommandOption.of(new String[] { "arg1" }, new Character[0], "description", type, false,
+				null, null, null, null, null, null);
+
+		List<CommandOption> options = Arrays.asList(option1);
+		String[] args = new String[] { "--arg1", "1" };
+		CommandParserResults results = parser.parse(options, args);
+		assertThat(results.results()).hasSize(1);
+		assertThat(results.results().get(0).option()).isSameAs(option1);
+		assertThat(results.results().get(0).value()).isEqualTo(1);
+	}
+
 	private static CommandOption longOption(String name) {
 		return longOption(name, null);
 	}

spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/OptionTypeCommands.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.shell.samples.e2e;
 
+import java.io.PrintWriter;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.shell.command.CommandRegistration;
 import org.springframework.shell.standard.ShellComponent;
@@ -48,7 +50,14 @@ public CommandRegistration testOptionTypeRegistration() {
 				.label("MYLABEL")
 				.and()
 			.withTarget()
-				.consumer(ctx -> {})
+				.consumer(ctx -> {
+					PrintWriter writer = ctx.getTerminal().writer();
+					if (ctx.hasMappedOption("arg3")) {
+						int v = ctx.getOptionValue("arg3");
+						writer.append("arg3=" + Integer.toString(v) + "\n");
+					}
+					writer.flush();
+				})
 				.and()
 			.build();
 	}