Improve API coherence by moving related classes in the same package

Author: fmbenhassine

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

@@ -26,9 +26,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.core.CompletingParsedLine;
-import org.springframework.shell.core.CompletionContext;
-import org.springframework.shell.core.CompletionProposal;
+import org.springframework.shell.core.jline.CompletingParsedLine;
+import org.springframework.shell.core.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 import org.springframework.shell.core.Shell;
 
 /**

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

@@ -27,8 +27,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.shell.core.ResultHandler;
-import org.springframework.shell.core.ResultHandlerService;
+import org.springframework.shell.core.result.ResultHandler;
+import org.springframework.shell.core.result.ResultHandlerService;
 import org.springframework.shell.core.Shell;
 import org.springframework.shell.core.command.CommandRegistry;
 import org.springframework.shell.core.config.ShellConversionServiceSupplier;

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

@@ -20,10 +20,10 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.shell.core.command.CommandRegistry;
-import org.springframework.shell.standard.CommandValueProvider;
-import org.springframework.shell.standard.EnumValueProvider;
-import org.springframework.shell.standard.FileValueProvider;
-import org.springframework.shell.standard.ValueProvider;
+import org.springframework.shell.core.CommandValueProvider;
+import org.springframework.shell.core.EnumValueProvider;
+import org.springframework.shell.core.FileValueProvider;
+import org.springframework.shell.core.ValueProvider;
 
 /**
  * Sets up all required beans for supporting the standard Shell API.

spring-shell-core/pom.xml

@@ -46,6 +46,11 @@
 			<artifactId>jline</artifactId>
 			<version>${jline.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>ST4</artifactId>
+			<version>${antlr-st4.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

spring-shell-standard/src/main/java/org/springframework/shell/standard/CommandValueProvider.java renamed to spring-shell-core/src/main/java/org/springframework/shell/core/CommandValueProvider.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.shell.standard;
+package org.springframework.shell.core;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.shell.core.CompletionContext;
-import org.springframework.shell.core.CompletionProposal;
 import org.springframework.shell.core.command.CommandRegistry;
+import org.springframework.shell.core.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 
 /**
  * A {@link ValueProvider} that can be used to auto-complete names of shell commands.

spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java renamed to spring-shell-core/src/main/java/org/springframework/shell/core/EnumValueProvider.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.shell.standard;
+package org.springframework.shell.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.shell.core.CompletionContext;
-import org.springframework.shell.core.CompletionProposal;
 import org.springframework.shell.core.command.CommandOption;
+import org.springframework.shell.core.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 
 /**
  * A {@link ValueProvider} that knows how to complete values for {@link Enum} typed parameters.

spring-shell-standard/src/main/java/org/springframework/shell/standard/FileValueProvider.java renamed to spring-shell-core/src/main/java/org/springframework/shell/core/FileValueProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.shell.standard;
+package org.springframework.shell.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.shell.core.CompletionContext;
-import org.springframework.shell.core.CompletionProposal;
+import org.springframework.shell.core.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 import org.springframework.util.StringUtils;
 
 import static java.nio.file.FileVisitOption.FOLLOW_LINKS;

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

@@ -42,11 +42,15 @@
 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.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 import org.springframework.shell.core.completion.CompletionResolver;
 import org.springframework.shell.core.context.InteractionMode;
 import org.springframework.shell.core.context.ShellContext;
 import org.springframework.shell.core.exit.ExitCodeExceptionProvider;
 import org.springframework.shell.core.exit.ExitCodeMappings;
+import org.springframework.shell.core.result.ResultHandler;
+import org.springframework.shell.core.result.ResultHandlerService;
 import org.springframework.util.StringUtils;
 
 /**

spring-shell-standard/src/main/java/org/springframework/shell/standard/ValueProvider.java renamed to spring-shell-core/src/main/java/org/springframework/shell/core/ValueProvider.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.shell.standard;
+package org.springframework.shell.core;
 
 import java.util.List;
 
-import org.springframework.shell.core.CompletionContext;
-import org.springframework.shell.core.CompletionProposal;
+import org.springframework.shell.core.completion.CompletionContext;
+import org.springframework.shell.core.completion.CompletionProposal;
 
 /**
  * Beans implementing this interface are queried during TAB completion to gather

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.shell.core;
+package org.springframework.shell.core.command;
 
 import java.util.Objects;