From 1acda68d39a1f464bddd42ef10becf04a17dbaca Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 17 Sep 2025 12:35:00 -0700 Subject: [PATCH] Relocate `AnsiOutputApplicationListener` Move `AnsiOutputApplicationListener` from `o.s.b.context.config` to `o.s.b.support` since it's more of a supporting class than a context concern. See gh-47232 --- .../config => support}/AnsiOutputApplicationListener.java | 5 ++--- .../spring-boot/src/main/resources/META-INF/spring.factories | 2 +- .../AnsiOutputApplicationListenerTests.java | 2 +- .../boot/devtools/RemoteSpringApplication.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename core/spring-boot/src/main/java/org/springframework/boot/{context/config => support}/AnsiOutputApplicationListener.java (93%) rename core/spring-boot/src/test/java/org/springframework/boot/{context/config => support}/AnsiOutputApplicationListenerTests.java (98%) diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java b/core/spring-boot/src/main/java/org/springframework/boot/support/AnsiOutputApplicationListener.java similarity index 93% rename from core/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java rename to core/spring-boot/src/main/java/org/springframework/boot/support/AnsiOutputApplicationListener.java index ce69a8ad99e..671845a5d73 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/support/AnsiOutputApplicationListener.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.context.config; +package org.springframework.boot.support; import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiOutput.Enabled; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.support.EnvironmentPostProcessorApplicationListener; import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; @@ -32,7 +31,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * * @author Raphael von der Grün * @author Madhura Bhave - * @since 1.2.0 + * @since 4.0.0 */ public class AnsiOutputApplicationListener implements ApplicationListener, Ordered { diff --git a/core/spring-boot/src/main/resources/META-INF/spring.factories b/core/spring-boot/src/main/resources/META-INF/spring.factories index 2e29517b78f..7aab018470e 100644 --- a/core/spring-boot/src/main/resources/META-INF/spring.factories +++ b/core/spring-boot/src/main/resources/META-INF/spring.factories @@ -40,8 +40,8 @@ org.springframework.context.ApplicationListener=\ org.springframework.boot.ClearCachesApplicationListener,\ org.springframework.boot.builder.ParentContextCloserApplicationListener,\ org.springframework.boot.context.FileEncodingApplicationListener,\ -org.springframework.boot.context.config.AnsiOutputApplicationListener,\ org.springframework.boot.context.logging.LoggingApplicationListener,\ +org.springframework.boot.support.AnsiOutputApplicationListener,\ org.springframework.boot.support.EnvironmentPostProcessorApplicationListener # Environment Post Processors diff --git a/core/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/core/spring-boot/src/test/java/org/springframework/boot/support/AnsiOutputApplicationListenerTests.java similarity index 98% rename from core/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java rename to core/spring-boot/src/test/java/org/springframework/boot/support/AnsiOutputApplicationListenerTests.java index 4db622023dd..aefb127892f 100644 --- a/core/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java +++ b/core/spring-boot/src/test/java/org/springframework/boot/support/AnsiOutputApplicationListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.config; +package org.springframework.boot.support; import java.util.HashMap; import java.util.Map; diff --git a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java index 9fb831ebd48..781668a79a3 100644 --- a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java +++ b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java @@ -24,13 +24,13 @@ import org.springframework.boot.Banner; import org.springframework.boot.ResourceBanner; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.context.config.AnsiOutputApplicationListener; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.logging.LoggingApplicationListener; import org.springframework.boot.devtools.remote.client.RemoteClientConfiguration; import org.springframework.boot.devtools.restart.RestartInitializer; import org.springframework.boot.devtools.restart.RestartScopeInitializer; import org.springframework.boot.devtools.restart.Restarter; +import org.springframework.boot.support.AnsiOutputApplicationListener; import org.springframework.boot.support.EnvironmentPostProcessorApplicationListener; import org.springframework.boot.support.EnvironmentPostProcessorsFactory; import org.springframework.context.ApplicationContextInitializer;