Refactor

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

Author: piotrooo

spring-shell-core/src/main/java/org/springframework/shell/core/Shell.java

@@ -42,6 +42,8 @@
 import org.springframework.shell.core.command.CommandRegistry;
 import org.springframework.shell.core.command.CommandExecution.CommandExecutionException;
 import org.springframework.shell.core.command.CommandExecution.CommandExecutionHandlerMethodArgumentResolvers;
+import org.springframework.shell.core.command.metadata.CommandAlias;
+import org.springframework.shell.core.command.metadata.CommandHandlingResult;
 import org.springframework.shell.core.command.metadata.CommandOption;
 import org.springframework.shell.core.completion.CompletionContext;
 import org.springframework.shell.core.completion.CompletionProposal;
@@ -230,7 +232,7 @@ else if (processExceptionNonInt != null && processExceptionNonInt.exitCode() !=
 				return true;
 			}
 			for (CommandAlias a : r.getAliases()) {
-				if (a.getCommand().equals(command)) {
+				if (a.command().equals(command)) {
 					return true;
 				}
 			}
@@ -244,7 +246,7 @@ else if (processExceptionNonInt != null && processExceptionNonInt.exitCode() !=
 		if (this.exitCodeMappings != null) {
 			List<Function<Throwable, Integer>> mappingFunctions = commandRegistration.get()
 				.getExitCode()
-				.getMappingFunctions();
+				.mappingFunctions();
 			this.exitCodeMappings.reset(mappingFunctions);
 		}
 

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

@@ -26,8 +26,11 @@
 
 import org.springframework.core.ResolvableType;
 import org.springframework.shell.core.command.availability.Availability;
+import org.springframework.shell.core.command.metadata.CommandAlias;
+import org.springframework.shell.core.command.metadata.CommandExitCode;
 import org.springframework.shell.core.command.metadata.CommandOption;
 import org.springframework.shell.core.command.metadata.CommandTarget;
+import org.springframework.shell.core.command.metadata.CommandHelpOptionInfo;
 import org.springframework.shell.core.completion.CompletionResolver;
 import org.springframework.shell.core.context.InteractionMode;
 
@@ -111,7 +114,7 @@ public interface Command {
 	 * Returns the help option info.
 	 * @return the help option info
 	 */
-	HelpOptionInfo getHelpOption();
+	CommandHelpOptionInfo getHelpOption();
 
 	/**
 	 * Creates a new {@link Builder} instance.

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

@@ -18,6 +18,7 @@
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
+import org.springframework.shell.core.command.metadata.CommandHandlingResult;
 
 /**
  * Interface to be implemented by objects that can resolve exceptions thrown during

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

@@ -41,6 +41,7 @@
 import org.springframework.shell.core.command.metadata.CommandTarget.TargetType;
 import org.springframework.shell.core.command.invocation.InvocableShellMethod;
 import org.springframework.shell.core.command.invocation.ShellMethodArgumentResolverComposite;
+import org.springframework.shell.core.command.metadata.CommandHelpOptionInfo;
 import org.springframework.shell.core.command.parser.ParserConfig;
 import org.springframework.shell.core.context.ShellContext;
 import org.springframework.util.Assert;
@@ -143,26 +144,25 @@ public DefaultCommandExecution(@Nullable List<? extends HandlerMethodArgumentRes
 
 			// check help options to short circuit
 			boolean handleHelpOption = false;
-			HelpOptionInfo helpOption = registration.getHelpOption();
-			if (helpOption.isEnabled() && helpOption.getCommand() != null
-					&& (!ObjectUtils.isEmpty(helpOption.getLongNames())
-							|| !ObjectUtils.isEmpty(helpOption.getShortNames()))) {
+			CommandHelpOptionInfo helpOption = registration.getHelpOption();
+			if (helpOption.enabled() && helpOption.command() != null && (!ObjectUtils.isEmpty(helpOption.longNames())
+					|| !ObjectUtils.isEmpty(helpOption.shortNames()))) {
 				handleHelpOption = results.results().stream().filter(cpr -> {
 					boolean present = false;
-					if (helpOption.getLongNames() != null) {
+					if (helpOption.longNames() != null) {
 						present = Arrays.asList(cpr.option().longNames())
 							.stream()
-							.filter(ln -> ObjectUtils.containsElement(helpOption.getLongNames(), ln))
+							.filter(ln -> ObjectUtils.containsElement(helpOption.longNames(), ln))
 							.findFirst()
 							.isPresent();
 					}
 					if (present) {
 						return true;
 					}
-					if (helpOption.getShortNames() != null) {
+					if (helpOption.shortNames() != null) {
 						present = Arrays.asList(cpr.option().shortNames())
 							.stream()
-							.filter(sn -> ObjectUtils.containsElement(helpOption.getShortNames(), sn))
+							.filter(sn -> ObjectUtils.containsElement(helpOption.shortNames(), sn))
 							.findFirst()
 							.isPresent();
 					}
@@ -175,7 +175,7 @@ public DefaultCommandExecution(@Nullable List<? extends HandlerMethodArgumentRes
 			if (handleHelpOption) {
 				String command = registration.getCommand();
 				CommandParser helpParser = CommandParser.of(conversionService, registrations, new ParserConfig());
-				Command helpCommand = registrations.get(registration.getHelpOption().getCommand());
+				Command helpCommand = registrations.get(registration.getHelpOption().command());
 				CommandParserResults helpResults = helpParser.parse(new String[] { "help", "--command", command });
 				results = helpResults;
 				usedRegistration = helpCommand;

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

@@ -18,9 +18,10 @@
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.AttributedStyle;
-
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.shell.core.command.CommandExecution.CommandParserExceptionsException;
+import org.springframework.shell.core.command.metadata.CommandHandlingResult;
 
 /**
  * Handles {@link CommandParserExceptionsException}.
@@ -40,7 +41,7 @@ public class CommandParserExceptionResolver implements CommandExceptionResolver
 				builder.append("\n");
 			});
 			String as = builder.toAttributedString().toAnsi();
-			return CommandHandlingResult.of(as);
+			return new CommandHandlingResult(as);
 		}
 		return null;
 	}