Move core commands to spring-shell-core module

This commit moves core commands from spring-shell-standard to the core
module.

This commit also reverts d396282 as APIs
are entangled which creates circular dependencies. #847 will be revisited
in another iteration.

Resolves #1212

Author: fmbenhassine

pom.xml

@@ -85,9 +85,7 @@
 	</properties>
 
 	<modules>
-		<module>spring-shell-tui</module>
 		<module>spring-shell-core</module>
-		<module>spring-shell-standard</module>
 		<module>spring-shell-test</module>
 		<module>spring-shell-autoconfigure</module>
 		<module>spring-shell-test-autoconfigure</module>

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

@@ -27,9 +27,9 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.shell.tui.component.flow.ComponentFlow;
-import org.springframework.shell.tui.component.flow.ComponentFlow.Builder;
-import org.springframework.shell.tui.style.TemplateExecutor;
+import org.springframework.shell.core.tui.component.flow.ComponentFlow;
+import org.springframework.shell.core.tui.component.flow.ComponentFlow.Builder;
+import org.springframework.shell.core.tui.style.TemplateExecutor;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link ComponentFlow}.

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

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

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

@@ -32,15 +32,15 @@
 import org.springframework.shell.boot.SpringShellProperties.VersionCommand;
 import org.springframework.shell.boot.condition.OnCompletionCommandCondition;
 import org.springframework.shell.core.result.ThrowableResultHandler;
-import org.springframework.shell.standard.commands.Clear;
-import org.springframework.shell.standard.commands.Completion;
-import org.springframework.shell.standard.commands.Help;
-import org.springframework.shell.standard.commands.History;
-import org.springframework.shell.standard.commands.Quit;
-import org.springframework.shell.standard.commands.Script;
-import org.springframework.shell.standard.commands.Stacktrace;
-import org.springframework.shell.standard.commands.Version;
-import org.springframework.shell.tui.style.TemplateExecutor;
+import org.springframework.shell.core.commands.Clear;
+import org.springframework.shell.core.commands.Completion;
+import org.springframework.shell.core.commands.Help;
+import org.springframework.shell.core.commands.History;
+import org.springframework.shell.core.commands.Quit;
+import org.springframework.shell.core.commands.Script;
+import org.springframework.shell.core.commands.Stacktrace;
+import org.springframework.shell.core.commands.Version;
+import org.springframework.shell.core.tui.style.TemplateExecutor;
 import org.springframework.util.Assert;
 
 /**

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

@@ -23,13 +23,13 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
-import org.springframework.shell.tui.component.ViewComponentBuilder;
-import org.springframework.shell.tui.component.ViewComponentExecutor;
-import org.springframework.shell.tui.component.view.TerminalUI;
-import org.springframework.shell.tui.component.view.TerminalUIBuilder;
-import org.springframework.shell.tui.component.view.TerminalUICustomizer;
-import org.springframework.shell.tui.style.ThemeActive;
-import org.springframework.shell.tui.style.ThemeResolver;
+import org.springframework.shell.core.tui.component.ViewComponentBuilder;
+import org.springframework.shell.core.tui.component.ViewComponentExecutor;
+import org.springframework.shell.core.tui.component.view.TerminalUI;
+import org.springframework.shell.core.tui.component.view.TerminalUIBuilder;
+import org.springframework.shell.core.tui.component.view.TerminalUICustomizer;
+import org.springframework.shell.core.tui.style.ThemeActive;
+import org.springframework.shell.core.tui.style.ThemeResolver;
 
 @AutoConfiguration
 @ConditionalOnClass(TerminalUI.class)

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

@@ -20,12 +20,12 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.shell.tui.style.TemplateExecutor;
-import org.springframework.shell.tui.style.Theme;
-import org.springframework.shell.tui.style.ThemeActive;
-import org.springframework.shell.tui.style.ThemeRegistry;
-import org.springframework.shell.tui.style.ThemeResolver;
-import org.springframework.shell.tui.style.ThemeSettings;
+import org.springframework.shell.core.tui.style.TemplateExecutor;
+import org.springframework.shell.core.tui.style.Theme;
+import org.springframework.shell.core.tui.style.ThemeActive;
+import org.springframework.shell.core.tui.style.ThemeRegistry;
+import org.springframework.shell.core.tui.style.ThemeResolver;
+import org.springframework.shell.core.tui.style.ThemeSettings;
 import org.springframework.util.StringUtils;
 
 @AutoConfiguration

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/StandardCommandsAutoConfigurationTests.java

@@ -22,8 +22,8 @@
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.shell.standard.commands.Completion;
-import org.springframework.shell.standard.commands.Help;
+import org.springframework.shell.core.commands.Completion;
+import org.springframework.shell.core.commands.Help;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/TerminalUIAutoConfigurationTests.java

@@ -25,12 +25,12 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.shell.tui.component.view.TerminalUI;
-import org.springframework.shell.tui.component.view.TerminalUIBuilder;
-import org.springframework.shell.tui.component.view.TerminalUICustomizer;
-import org.springframework.shell.tui.style.ThemeActive;
-import org.springframework.shell.tui.style.ThemeRegistry;
-import org.springframework.shell.tui.style.ThemeResolver;
+import org.springframework.shell.core.tui.component.view.TerminalUI;
+import org.springframework.shell.core.tui.component.view.TerminalUIBuilder;
+import org.springframework.shell.core.tui.component.view.TerminalUICustomizer;
+import org.springframework.shell.core.tui.style.ThemeActive;
+import org.springframework.shell.core.tui.style.ThemeRegistry;
+import org.springframework.shell.core.tui.style.ThemeResolver;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/ThemingAutoConfigurationTests.java

@@ -25,14 +25,14 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.shell.tui.style.FigureSettings;
-import org.springframework.shell.tui.style.SpinnerSettings;
-import org.springframework.shell.tui.style.StyleSettings;
-import org.springframework.shell.tui.style.TemplateExecutor;
-import org.springframework.shell.tui.style.Theme;
-import org.springframework.shell.tui.style.ThemeRegistry;
-import org.springframework.shell.tui.style.ThemeResolver;
-import org.springframework.shell.tui.style.ThemeSettings;
+import org.springframework.shell.core.tui.style.FigureSettings;
+import org.springframework.shell.core.tui.style.SpinnerSettings;
+import org.springframework.shell.core.tui.style.StyleSettings;
+import org.springframework.shell.core.tui.style.TemplateExecutor;
+import org.springframework.shell.core.tui.style.Theme;
+import org.springframework.shell.core.tui.style.ThemeRegistry;
+import org.springframework.shell.core.tui.style.ThemeResolver;
+import org.springframework.shell.core.tui.style.ThemeSettings;
 import org.springframework.util.StringUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-shell-core/pom.xml

@@ -51,6 +51,16 @@
 			<artifactId>ST4</artifactId>
 			<version>${antlr-st4.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>${reactor.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -86,6 +96,24 @@
 			<version>${assertj.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<version>${reactor.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>${awaitility.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.jimfs</groupId>
+			<artifactId>jimfs</artifactId>
+			<version>${jimfs.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>