Cleanup

Signed-off-by: Piotr Olaszewski <[email protected]>

Author: piotrooo

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandRegistrationCustomizer.java

@@ -15,20 +15,20 @@
  */
 package org.springframework.shell.boot;
 
-import org.springframework.shell.core.command.Command;
+import org.springframework.shell.core.command.CommandRegistration;
 
 /**
- * Callback interface that can be used to customize a {@link Command.Builder}.
+ * Callback interface that can be used to customize a {@link CommandRegistration.Builder}.
  *
  * @author Janne Valkealahti
  */
 @FunctionalInterface
 public interface CommandRegistrationCustomizer {
 
 	/**
-	 * Callback to customize a {@link Command.Builder} instance.
+	 * Callback to customize a {@link CommandRegistration.Builder} instance.
 	 * @param commandRegistrationBuilder the command registration builder to customize
 	 */
-	void customize(Command.Builder commandRegistrationBuilder);
+	void customize(CommandRegistration.Builder commandRegistrationBuilder);
 
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandRegistryAutoConfiguration.java

@@ -27,11 +27,11 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.shell.core.MethodTargetRegistrar;
 import org.springframework.shell.boot.SpringShellProperties.Help;
-import org.springframework.shell.core.command.Command;
 import org.springframework.shell.core.command.CommandRegistry;
 import org.springframework.shell.core.command.CommandRegistryCustomizer;
-import org.springframework.shell.core.command.BuilderSupplier;
-import org.springframework.shell.core.command.OptionNameModifier;
+import org.springframework.shell.core.command.CommandRegistration;
+import org.springframework.shell.core.command.CommandRegistration.BuilderSupplier;
+import org.springframework.shell.core.command.CommandRegistration.OptionNameModifier;
 import org.springframework.shell.core.command.support.OptionNameModifierSupport;
 import org.springframework.shell.core.command.CommandResolver;
 import org.springframework.shell.core.context.ShellContext;
@@ -57,7 +57,8 @@ public CommandRegistry commandRegistry(ObjectProvider<MethodTargetRegistrar> met
 	}
 
 	@Bean
-	public CommandRegistryCustomizer defaultCommandRegistryCustomizer(ObjectProvider<Command> commandRegistrations) {
+	public CommandRegistryCustomizer defaultCommandRegistryCustomizer(
+			ObjectProvider<CommandRegistration> commandRegistrations) {
 		return registry -> {
 			commandRegistrations.orderedStream().forEach(registration -> {
 				registry.register(registration);
@@ -70,10 +71,11 @@ public CommandRegistrationCustomizer helpOptionsCommandRegistrationCustomizer(Sp
 		return registration -> {
 			Help help = properties.getHelp();
 			if (help.isEnabled()) {
-				registration.withHelpOptions(helpOptionsSpec -> helpOptionsSpec.enabled(true)
+				registration.withHelpOptions()
+					.enabled(true)
 					.longNames(help.getLongNames())
 					.shortNames(help.getShortNames())
-					.command(help.getCommand()));
+					.command(help.getCommand());
 			}
 		};
 	}
@@ -119,7 +121,7 @@ public CommandRegistrationCustomizer defaultOptionNameModifierCommandRegistratio
 	public BuilderSupplier commandRegistrationBuilderSupplier(
 			ObjectProvider<CommandRegistrationCustomizer> customizerProvider) {
 		return () -> {
-			Command.Builder builder = Command.builder();
+			CommandRegistration.Builder builder = CommandRegistration.builder();
 			customizerProvider.orderedStream().forEach((customizer) -> customizer.customize(builder));
 			return builder;
 		};