diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/ViewComponent.java b/spring-shell-core/src/main/java/org/springframework/shell/component/ViewComponent.java index fcbdfb09..16f31683 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/ViewComponent.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/ViewComponent.java @@ -17,11 +17,11 @@ package org.springframework.shell.component; import org.jline.terminal.Terminal; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.control.ViewDoneEvent; import org.springframework.shell.component.view.event.EventLoop; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.util.Assert; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageBuilder.java b/spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageBuilder.java similarity index 98% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageBuilder.java rename to spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageBuilder.java index 180b1741..58b1c481 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageBuilder.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.message; +package org.springframework.shell.component.message; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageHeaderAccessor.java b/spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageHeaderAccessor.java similarity index 98% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageHeaderAccessor.java rename to spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageHeaderAccessor.java index 39720180..876ccdf7 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageHeaderAccessor.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/message/ShellMessageHeaderAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.message; +package org.springframework.shell.component.message; import java.util.Arrays; import java.util.HashSet; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/StaticShellMessageHeaderAccessor.java b/spring-shell-core/src/main/java/org/springframework/shell/component/message/StaticShellMessageHeaderAccessor.java similarity index 98% rename from spring-shell-core/src/main/java/org/springframework/shell/component/view/message/StaticShellMessageHeaderAccessor.java rename to spring-shell-core/src/main/java/org/springframework/shell/component/message/StaticShellMessageHeaderAccessor.java index 968e5b9c..af791214 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/message/StaticShellMessageHeaderAccessor.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/message/StaticShellMessageHeaderAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell.component.view.message; +package org.springframework.shell.component.message; import java.util.UUID; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java index 3d7f42ed..18c5c6cb 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/TerminalUI.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.control.ViewService; import org.springframework.shell.component.view.event.DefaultEventLoop; @@ -44,7 +45,6 @@ import org.springframework.shell.component.view.event.KeyHandler.KeyHandlerResul import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.DefaultScreen; import org.springframework.shell.geom.Rectangle; import org.springframework.util.Assert; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java index f159fb4f..20ba694a 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AbstractView.java @@ -28,6 +28,7 @@ import reactor.core.Disposables; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyBindingConsumer; import org.springframework.shell.component.view.event.KeyBindingConsumerArgs; @@ -37,7 +38,6 @@ import org.springframework.shell.component.view.event.MouseBindingConsumer; import org.springframework.shell.component.view.event.MouseBindingConsumerArgs; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.geom.Rectangle; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java index 5162d49c..611aff0d 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/AppView.java @@ -15,11 +15,11 @@ */ package org.springframework.shell.component.view.control; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.geom.Rectangle; import org.springframework.shell.style.ThemeResolver; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java index 767ce942..43e685e1 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ButtonView.java @@ -16,10 +16,10 @@ package org.springframework.shell.component.view.control; import org.springframework.shell.component.view.event.KeyEvent.Key; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.KeyHandler; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.geom.Dimension; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java index cda7859e..9ccd74f1 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/DialogView.java @@ -19,11 +19,11 @@ import java.util.Arrays; import java.util.List; import java.util.ListIterator; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.control.ButtonView.ButtonViewSelectEvent; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.MouseHandler; import org.springframework.shell.component.view.event.MouseHandler.MouseHandlerResult; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.geom.Rectangle; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java index f38cbfba..6b332fde 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/InputView.java @@ -18,10 +18,10 @@ package org.springframework.shell.component.view.control; import java.util.ArrayList; import java.util.stream.Collectors; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyHandler; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.geom.Position; import org.springframework.shell.geom.Rectangle; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java index 0fe973a9..fbe2d1ee 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/ListView.java @@ -25,10 +25,10 @@ import java.util.Set; import java.util.function.BiFunction; import org.springframework.lang.Nullable; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.control.cell.ListCell; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.MouseEvent; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.ScreenItem; import org.springframework.shell.geom.Rectangle; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java index 2cb686cb..fe06723f 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/MenuView.java @@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; import org.springframework.shell.component.view.event.KeyEvent.Key; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.MouseEvent; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.geom.Dimension; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java index d83fb650..4e426141 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/control/StatusBarView.java @@ -23,9 +23,9 @@ import java.util.ListIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.MouseEvent; import org.springframework.shell.component.view.event.MouseHandler; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.geom.Rectangle; diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/DefaultEventLoop.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/DefaultEventLoop.java index 4e4fa9a0..10c628c9 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/DefaultEventLoop.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/DefaultEventLoop.java @@ -39,12 +39,12 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.shell.component.message.ShellMessageHeaderAccessor; +import org.springframework.shell.component.message.StaticShellMessageHeaderAccessor; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.control.ViewEvent; import org.springframework.shell.component.view.event.processor.AnimationEventLoopProcessor; import org.springframework.shell.component.view.event.processor.TaskEventLoopProcessor; -import org.springframework.shell.component.view.message.ShellMessageHeaderAccessor; -import org.springframework.shell.component.view.message.StaticShellMessageHeaderAccessor; import org.springframework.util.Assert; /** diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/AnimationEventLoopProcessor.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/AnimationEventLoopProcessor.java index 6026e536..da0a5659 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/AnimationEventLoopProcessor.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/AnimationEventLoopProcessor.java @@ -21,10 +21,10 @@ import reactor.core.publisher.Flux; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.shell.component.message.ShellMessageHeaderAccessor; +import org.springframework.shell.component.message.StaticShellMessageHeaderAccessor; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.EventLoop.EventLoopProcessor; -import org.springframework.shell.component.view.message.ShellMessageHeaderAccessor; -import org.springframework.shell.component.view.message.StaticShellMessageHeaderAccessor; /** * {@link EventLoopProcessor} converting incoming message into animation tick diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/TaskEventLoopProcessor.java b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/TaskEventLoopProcessor.java index 39af6619..d6cf9550 100644 --- a/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/TaskEventLoopProcessor.java +++ b/spring-shell-core/src/main/java/org/springframework/shell/component/view/event/processor/TaskEventLoopProcessor.java @@ -20,11 +20,11 @@ import reactor.core.publisher.Mono; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.shell.component.message.StaticShellMessageHeaderAccessor; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyBindingConsumerArgs; import org.springframework.shell.component.view.event.EventLoop.EventLoopProcessor; import org.springframework.shell.component.view.event.MouseBindingConsumerArgs; -import org.springframework.shell.component.view.message.StaticShellMessageHeaderAccessor; public class TaskEventLoopProcessor implements EventLoopProcessor { diff --git a/spring-shell-core/src/test/java/org/springframework/shell/component/view/event/DefaultEventLoopTests.java b/spring-shell-core/src/test/java/org/springframework/shell/component/view/event/DefaultEventLoopTests.java index b35a1cf0..5f60d384 100644 --- a/spring-shell-core/src/test/java/org/springframework/shell/component/view/event/DefaultEventLoopTests.java +++ b/spring-shell-core/src/test/java/org/springframework/shell/component/view/event/DefaultEventLoopTests.java @@ -27,8 +27,8 @@ import reactor.test.StepVerifier; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.event.EventLoop.EventLoopProcessor; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java b/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java index d1786bd1..1c40bd4e 100644 --- a/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java +++ b/spring-shell-docs/src/test/java/org/springframework/shell/docs/TerminalUiSnippets.java @@ -18,11 +18,11 @@ package org.springframework.shell.docs; import org.jline.terminal.Terminal; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent.Key; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.geom.HorizontalAlign; import org.springframework.shell.geom.VerticalAlign; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java index 8a112466..99897bc9 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java @@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.control.AppView; import org.springframework.shell.component.view.control.AppView.AppViewEvent; @@ -49,7 +50,6 @@ import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent; import org.springframework.shell.component.view.event.KeyEvent.Key; import org.springframework.shell.component.view.event.KeyEvent.KeyMask; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.geom.HorizontalAlign; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java index ab474808..c682bc7a 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/ClockScenario.java @@ -24,13 +24,13 @@ import reactor.core.publisher.Flux; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; +import org.springframework.shell.component.message.ShellMessageBuilder; +import org.springframework.shell.component.message.ShellMessageHeaderAccessor; +import org.springframework.shell.component.message.StaticShellMessageHeaderAccessor; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.event.EventLoop; import org.springframework.shell.component.view.event.KeyEvent.Key; -import org.springframework.shell.component.view.message.ShellMessageBuilder; -import org.springframework.shell.component.view.message.ShellMessageHeaderAccessor; -import org.springframework.shell.component.view.message.StaticShellMessageHeaderAccessor; import org.springframework.shell.geom.HorizontalAlign; import org.springframework.shell.geom.Rectangle; import org.springframework.shell.geom.VerticalAlign; diff --git a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/SnakeGameScenario.java b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/SnakeGameScenario.java index 922076bc..469a2894 100644 --- a/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/SnakeGameScenario.java +++ b/spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/other/SnakeGameScenario.java @@ -20,10 +20,10 @@ import java.util.LinkedList; import reactor.core.publisher.Flux; +import org.springframework.shell.component.message.ShellMessageBuilder; import org.springframework.shell.component.view.control.BoxView; import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.event.KeyEvent.Key; -import org.springframework.shell.component.view.message.ShellMessageBuilder; import org.springframework.shell.component.view.screen.Screen; import org.springframework.shell.component.view.screen.Screen.Writer; import org.springframework.shell.samples.catalog.scenario.AbstractScenario;