Move core APIs under a dedicated named package

Author: fmbenhassine

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

@@ -25,16 +25,16 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.MethodTargetRegistrar;
+import org.springframework.shell.core.MethodTargetRegistrar;
 import org.springframework.shell.boot.SpringShellProperties.Help;
-import org.springframework.shell.command.CommandCatalog;
-import org.springframework.shell.command.CommandCatalogCustomizer;
-import org.springframework.shell.command.CommandRegistration;
-import org.springframework.shell.command.CommandRegistration.BuilderSupplier;
-import org.springframework.shell.command.CommandRegistration.OptionNameModifier;
-import org.springframework.shell.command.support.OptionNameModifierSupport;
-import org.springframework.shell.command.CommandResolver;
-import org.springframework.shell.context.ShellContext;
+import org.springframework.shell.core.command.CommandCatalog;
+import org.springframework.shell.core.command.CommandCatalogCustomizer;
+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;
 
 @AutoConfiguration
 @EnableConfigurationProperties(SpringShellProperties.class)

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.shell.boot;
 
-import org.springframework.shell.command.CommandRegistration;
+import org.springframework.shell.core.command.CommandRegistration;
 
 /**
  * Callback interface that can be used to customize a {@link CommandRegistration.Builder}.

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

@@ -26,10 +26,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.CompletingParsedLine;
-import org.springframework.shell.CompletionContext;
-import org.springframework.shell.CompletionProposal;
-import org.springframework.shell.Shell;
+import org.springframework.shell.core.CompletingParsedLine;
+import org.springframework.shell.core.CompletionContext;
+import org.springframework.shell.core.CompletionProposal;
+import org.springframework.shell.core.Shell;
 
 /**
  * @author Piotr Olaszewski

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

@@ -25,9 +25,9 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.command.CommandExecution;
-import org.springframework.shell.exit.ExitCodeExceptionProvider;
-import org.springframework.shell.exit.ExitCodeMappings;
+import org.springframework.shell.core.command.CommandExecution;
+import org.springframework.shell.core.exit.ExitCodeExceptionProvider;
+import org.springframework.shell.core.exit.ExitCodeMappings;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for exit codes.

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

@@ -30,8 +30,8 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.jline.ExtendedDefaultParser;
-import org.springframework.shell.jline.PromptProvider;
+import org.springframework.shell.core.jline.ExtendedDefaultParser;
+import org.springframework.shell.core.jline.PromptProvider;
 
 /**
  * Shell implementation using JLine to capture input and trigger completions.

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

@@ -38,8 +38,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.EventListener;
-import org.springframework.shell.command.CommandCatalog;
-import org.springframework.shell.config.UserConfigPathProvider;
+import org.springframework.shell.core.command.CommandCatalog;
+import org.springframework.shell.core.config.UserConfigPathProvider;
 import org.springframework.util.StringUtils;
 
 /**

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

@@ -1,6 +1,6 @@
 package org.springframework.shell.boot;
 
-import org.springframework.shell.jline.NonInteractiveShellRunner;
+import org.springframework.shell.core.jline.NonInteractiveShellRunner;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the

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

@@ -22,13 +22,13 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.handler.annotation.support.HeadersMethodArgumentResolver;
 import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
-import org.springframework.shell.command.ArgumentHeaderMethodArgumentResolver;
-import org.springframework.shell.command.CommandContextMethodArgumentResolver;
-import org.springframework.shell.command.CommandExecution.CommandExecutionHandlerMethodArgumentResolvers;
-import org.springframework.shell.command.annotation.support.OptionMethodArgumentResolver;
-import org.springframework.shell.completion.CompletionResolver;
-import org.springframework.shell.completion.RegistrationOptionsCompletionResolver;
-import org.springframework.shell.config.ShellConversionServiceSupplier;
+import org.springframework.shell.core.command.ArgumentHeaderMethodArgumentResolver;
+import org.springframework.shell.core.command.CommandContextMethodArgumentResolver;
+import org.springframework.shell.core.command.CommandExecution.CommandExecutionHandlerMethodArgumentResolvers;
+import org.springframework.shell.core.command.annotation.support.OptionMethodArgumentResolver;
+import org.springframework.shell.core.completion.CompletionResolver;
+import org.springframework.shell.core.completion.RegistrationOptionsCompletionResolver;
+import org.springframework.shell.core.config.ShellConversionServiceSupplier;
 
 @AutoConfiguration
 public class ParameterResolverAutoConfiguration {

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

@@ -20,8 +20,8 @@
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.context.DefaultShellContext;
-import org.springframework.shell.context.ShellContext;
+import org.springframework.shell.core.context.DefaultShellContext;
+import org.springframework.shell.core.context.ShellContext;
 
 @AutoConfiguration
 public class ShellContextAutoConfiguration {

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

@@ -25,14 +25,14 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.shell.Shell;
+import org.springframework.shell.core.Shell;
 import org.springframework.shell.boot.condition.OnNotPrimaryCommandCondition;
 import org.springframework.shell.boot.condition.OnPrimaryCommandCondition;
-import org.springframework.shell.context.ShellContext;
-import org.springframework.shell.jline.InteractiveShellRunner;
-import org.springframework.shell.jline.NonInteractiveShellRunner;
-import org.springframework.shell.jline.PromptProvider;
-import org.springframework.shell.jline.ScriptShellRunner;
+import org.springframework.shell.core.context.ShellContext;
+import org.springframework.shell.core.jline.InteractiveShellRunner;
+import org.springframework.shell.core.jline.NonInteractiveShellRunner;
+import org.springframework.shell.core.jline.PromptProvider;
+import org.springframework.shell.core.jline.ScriptShellRunner;
 
 @AutoConfiguration
 public class ShellRunnerAutoConfiguration {