fix: revert removed import and merge samples

Author: Nico-DF

spring-shell-core/src/main/java/org/springframework/shell/component/StringInput.java

@@ -29,6 +29,7 @@
 import org.springframework.shell.component.StringInput.StringInputContext;
 import org.springframework.shell.component.context.ComponentContext;
 import org.springframework.shell.component.support.AbstractTextComponent;
+import org.springframework.shell.component.support.AbstractTextComponent.TextComponentContext;
 import org.springframework.util.StringUtils;
 
 /**

spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentCommands.java

@@ -49,26 +49,18 @@
 public class ComponentCommands extends AbstractShellComponent {
 
 	@ShellMethod(key = "component string", value = "String input", group = "Components")
-	public String stringInput(boolean mask) {
-		StringInput component = new StringInput(getTerminal(), "Enter value", "myvalue");
+	public String stringInput(boolean mask, boolean required) {
+		StringInput component = new StringInput(getTerminal(), "Enter value", null);
 		component.setResourceLoader(getResourceLoader());
 		component.setTemplateExecutor(getTemplateExecutor());
+		component.setRequired(required);
 		if (mask) {
 			component.setMaskCharacter('*');
 		}
 		StringInputContext context = component.run(StringInputContext.empty());
 		return "Got value " + context.getResultValue();
 	}
 
-	@ShellMethod(key = "component string required", value = "String input", group = "Components")
-	public String stringRequired() {
-		StringInput component = new StringInput(getTerminal(), "Enter value", null, null, true);
-		component.setResourceLoader(getResourceLoader());
-		component.setTemplateExecutor(getTemplateExecutor());
-		StringInputContext context = component.run(StringInputContext.empty());
-		return "Got value " + context.getResultValue();
-	}
-
 	@ShellMethod(key = "component path input", value = "Path input", group = "Components")
 	public String pathInput() {
 		PathInput component = new PathInput(getTerminal(), "Enter value");