Update samples

- Simplify hello world sample to the bare minimum
- Update groups in PetClinic commands

Author: fmbenhassine

spring-shell-samples/spring-shell-sample-hello-world/src/main/java/org/springframework/shell/samples/helloworld/HelloCommand.java

@@ -1,15 +1,11 @@
 package org.springframework.shell.samples.helloworld;
 
-import java.io.PrintWriter;
-import java.util.List;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.shell.core.ShellRunner;
-import org.springframework.shell.core.command.CommandContext;
-import org.springframework.shell.core.command.annotation.*;
-import org.springframework.shell.core.commands.AbstractCommand;
+import org.springframework.shell.core.command.annotation.Command;
+import org.springframework.shell.core.command.annotation.EnableCommand;
+import org.springframework.shell.core.command.annotation.Option;
 
 @EnableCommand(SpringShellApplication.class)
 public class SpringShellApplication {
@@ -20,59 +16,11 @@ public static void main(String[] args) throws Exception {
 		runner.run(args);
 	}
 
-	@Command(name = "hi", description = "Say hi to a given name", group = "greetings",
-			help = "A command that greets the user with 'Hi ${name}!' with a configurable suffix. Example usage: hi -s=! John")
-	public void sayHi(
-			@Argument(index = 0, description = "the name of the person to greet", defaultValue = "world") String name,
-			@Option(shortName = 's', longName = "suffix", description = "the suffix of the greeting message",
-					defaultValue = "!") char suffix) {
-		System.out.println("Hi " + name + suffix);
-	}
-
-	@Command(name = "hey", description = "Say hey to everyone", group = "greetings",
-			help = "A command that greets all given names. Example usage: hey John Doe -s=!")
-	public void sayHeyToEveryone(@Arguments List<String> names, @Option(shortName = 's', longName = "suffix",
-			description = "the suffix of the greeting message", defaultValue = "!") char suffix) {
-		System.out.println("Hey " + String.join(",", names) + suffix);
-	}
-
-	@Command(name = "yo", description = "Say yo", group = "greetings",
-			help = "A command that greets the user with 'Yo there! what's up?'")
-	public void sayYo(CommandContext commandContext) {
-		try (PrintWriter outputWriter = commandContext.outputWriter()) {
-			outputWriter.println("Yo there! what's up?");
-		}
-	}
-
-	@Bean
-	public AbstractCommand sayGoodMorning() {
-		return org.springframework.shell.core.command.Command.builder()
-			.name("good-morning")
-			.description("Say good morning")
-			.group("greetings")
-			.help("A command that greets the user with 'Good morning!'")
-			.execute(commandContext -> {
-				String ansiString = "Good morning!";
-				try (PrintWriter outputWriter = commandContext.outputWriter()) {
-					outputWriter.println(ansiString);
-					outputWriter.flush();
-				}
-			});
-	}
-
-	@Bean
-	public AbstractCommand sayGoodDay() {
-		return org.springframework.shell.core.command.Command.builder()
-			.name("good-day")
-			.description("Say good day")
-			.group("greetings")
-			.help("A command that greets the user with 'Good day!'")
-			.execute(commandContext -> "Good day!");
-	}
-
-	@Bean
-	public HelloCommand sayHello() {
-		return new HelloCommand();
+	@Command(name = "hello", description = "Say hello to a given name", group = "Greetings",
+			help = "A command that greets the user with 'Hello ${name}!'. Usage: hello [-n | --name]=<name>")
+	public void sayHello(@Option(shortName = 'n', longName = "name", description = "the name of the person to greet",
+			defaultValue = "World") String name) {
+		System.out.println("Hello " + name + "!");
 	}
 
 }

spring-shell-samples/spring-shell-sample-hello-world/src/main/java/org/springframework/shell/samples/helloworld/SpringShellApplication.java

@@ -36,7 +36,7 @@ public class OwnerDetailsCommand extends AbstractCommand {
 	private final JdbcClient jdbcClient;
 
 	public OwnerDetailsCommand(JdbcClient jdbcClient) {
-		super("owners info", "Show details of a given owner", "owners", "show the details of a given owner");
+		super("owners info", "Show details of a given owner", "Owners", "show the details of a given owner");
 		this.jdbcClient = jdbcClient;
 	}
 

spring-shell-samples/spring-shell-sample-petclinic/src/main/java/org/springframework/shell/samples/petclinic/commands/OwnerDetailsCommand.java

@@ -37,7 +37,7 @@ public class OwnersListCommand extends AbstractCommand {
 	private final JdbcClient jdbcClient;
 
 	public OwnersListCommand(JdbcClient jdbcClient) {
-		super("owners list", "List owners", "owners", "Command to list owners");
+		super("owners list", "List owners", "Owners", "Command to list owners");
 		this.jdbcClient = jdbcClient;
 	}
 

spring-shell-samples/spring-shell-sample-petclinic/src/main/java/org/springframework/shell/samples/petclinic/commands/OwnersListCommand.java

@@ -38,7 +38,7 @@ public PetCommands(JdbcClient jdbcClient) {
 		this.jdbcClient = jdbcClient;
 	}
 
-	@Command(name = { "pets", "list" }, description = "List pets", group = "pets", help = "List pets in Pet Clinic")
+	@Command(name = { "pets", "list" }, description = "List pets", group = "Pets", help = "List pets in Pet Clinic")
 	public void listPets(CommandContext commandContext) {
 		List<@Nullable Pet> pets = jdbcClient.sql("SELECT id, name FROM PETS")
 			.query(new DataClassRowMapper<>(Pet.class))
@@ -51,7 +51,7 @@ public void listPets(CommandContext commandContext) {
 	}
 
 	// TODO inject context and use output writer instead of System.out and System.err
-	@Command(name = { "pets", "info" }, description = "Show detail about a given pet", group = "pets",
+	@Command(name = { "pets", "info" }, description = "Show detail about a given pet", group = "Pets",
 			help = "Show the details about a given pet")
 	public void showPet(@Option(longName = "petId", description = "The pet ID") int id) {
 		try {

spring-shell-samples/spring-shell-sample-petclinic/src/main/java/org/springframework/shell/samples/petclinic/commands/PetCommands.java

@@ -36,7 +36,7 @@ public class VetDetailsCommand extends AbstractCommand {
 	private final JdbcClient jdbcClient;
 
 	public VetDetailsCommand(JdbcClient jdbcClient) {
-		super("vets info", "Show details of a given veterinarian", "vets", "show the details of a given veterinarian");
+		super("vets info", "Show details of a given veterinarian", "Vets", "show the details of a given veterinarian");
 		this.jdbcClient = jdbcClient;
 	}
 

spring-shell-samples/spring-shell-sample-petclinic/src/main/java/org/springframework/shell/samples/petclinic/commands/VetDetailsCommand.java

@@ -37,7 +37,7 @@ public class VetsListCommand extends AbstractCommand {
 	private final JdbcClient jdbcClient;
 
 	public VetsListCommand(JdbcClient jdbcClient) {
-		super("vets list", "List veterinarians", "vets", "Command to list veterinarians");
+		super("vets list", "List veterinarians", "Vets", "Command to list veterinarians");
 		this.jdbcClient = jdbcClient;
 	}
 

spring-shell-samples/spring-shell-sample-petclinic/src/main/java/org/springframework/shell/samples/petclinic/commands/VetsListCommand.java

@@ -2,8 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.shell.core.command.annotation.Argument;
 import org.springframework.shell.core.command.annotation.Command;
 import org.springframework.shell.core.command.annotation.Option;
 
@@ -14,18 +12,11 @@ public static void main(String[] args) {
 		SpringApplication.run(SpringShellApplication.class, args);
 	}
 
-	@Command(name = "hi", description = "Say hi to a given name", group = "greetings",
-			help = "A command that greets the user with 'Hi ${name}!' with a configurable suffix. Example usage: hi -s=! John")
-	public void sayHi(
-			@Argument(index = 0, description = "the name of the person to greet", defaultValue = "world") String name,
-			@Option(shortName = 's', longName = "suffix", description = "the suffix of the greeting message",
-					defaultValue = "!") char suffix) {
-		System.out.println("Hi " + name + suffix);
-	}
-
-	@Bean
-	public HelloCommand sayHello() {
-		return new HelloCommand();
+	@Command(name = "hello", description = "Say hello to a given name", group = "Greetings",
+			help = "A command that greets the user with 'Hello ${name}!'. Usage: hello [-n | --name]=<name>")
+	public void sayHello(@Option(shortName = 'n', longName = "name", description = "the name of the person to greet",
+			defaultValue = "World") String name) {
+		System.out.println("Hello " + name + "!");
 	}
 
 }