From bc76c87d446ebbb5091e6d8a32c2dabf35a0eef9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 11 Nov 2014 16:18:22 -0800 Subject: [PATCH] Fix AnsiOutputApplicationListener package tangle Relocate AnsiOutputApplicationListener to `context.embedded.config` to fix package tangle. See gh-1243 --- .../AnsiOutputApplicationListener.java | 8 ++--- .../main/resources/META-INF/spring.factories | 2 +- .../boot/ansi/AnsiOutputEnabledValue.java | 32 +++++++++++++++++++ .../AnsiOutputApplicationListenerTests.java | 11 ++++--- 4 files changed, 44 insertions(+), 9 deletions(-) rename spring-boot/src/main/java/org/springframework/boot/{ansi => context/config}/AnsiOutputApplicationListener.java (91%) create mode 100644 spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputEnabledValue.java rename spring-boot/src/test/java/org/springframework/boot/{ansi => context/embedded/config}/AnsiOutputApplicationListenerTests.java (84%) diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutputApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java similarity index 91% rename from spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutputApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java index ee106dd1b1f..be7ede154c7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutputApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.boot.ansi; +package org.springframework.boot.context.config; +import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiOutput.Enabled; import org.springframework.boot.bind.RelaxedPropertyResolver; -import org.springframework.boot.context.config.ConfigFileApplicationListener; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; /** * An {@link ApplicationListener} that configures {@link AnsiOutput} depending on the the - * value of the property spring.output.ansi.enabled. See - * {@link AnsiOutput.Enabled} for valid values. + * value of the property spring.output.ansi.enabled. See {@link Enabled} for + * valid values. * * @author Raphael von der Grün * @since 1.2.0 diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories index fb942f5087a..8e8a6cf7ab6 100644 --- a/spring-boot/src/main/resources/META-INF/spring.factories +++ b/spring-boot/src/main/resources/META-INF/spring.factories @@ -14,10 +14,10 @@ org.springframework.boot.context.config.DelegatingApplicationContextInitializer # Application Listeners org.springframework.context.ApplicationListener=\ -org.springframework.boot.ansi.AnsiOutputApplicationListener,\ org.springframework.boot.builder.ParentContextCloserApplicationListener,\ org.springframework.boot.cloudfoundry.VcapApplicationListener,\ org.springframework.boot.context.FileEncodingApplicationListener,\ +org.springframework.boot.context.config.AnsiOutputApplicationListener,\ org.springframework.boot.context.config.ConfigFileApplicationListener,\ org.springframework.boot.context.config.DelegatingApplicationListener,\ org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener,\ diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputEnabledValue.java b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputEnabledValue.java new file mode 100644 index 00000000000..22a9bed1ca1 --- /dev/null +++ b/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputEnabledValue.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.ansi; + +import org.springframework.boot.ansi.AnsiOutput.Enabled; + +/** + * Public access to {@link AnsiOutput#getEnabled()} for other tests to use. + * + * @author Phillip Webb + */ +public class AnsiOutputEnabledValue { + + public static Enabled get() { + return AnsiOutput.getEnabled(); + } + +} diff --git a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/config/AnsiOutputApplicationListenerTests.java similarity index 84% rename from spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/embedded/config/AnsiOutputApplicationListenerTests.java index 61a320d74b4..8967379b925 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/config/AnsiOutputApplicationListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ansi; +package org.springframework.boot.context.embedded.config; import java.util.HashMap; import java.util.Map; @@ -23,7 +23,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.boot.SpringApplication; +import org.springframework.boot.ansi.AnsiOutput; import org.springframework.boot.ansi.AnsiOutput.Enabled; +import org.springframework.boot.ansi.AnsiOutputEnabledValue; +import org.springframework.boot.context.config.AnsiOutputApplicationListener; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; @@ -53,7 +56,7 @@ public class AnsiOutputApplicationListenerTests { props.put("spring.output.ansi.enabled", "ALWAYS"); application.setDefaultProperties(props); application.run(); - assertThat(AnsiOutput.getEnabled(), equalTo(Enabled.ALWAYS)); + assertThat(AnsiOutputEnabledValue.get(), equalTo(Enabled.ALWAYS)); } @Test @@ -64,7 +67,7 @@ public class AnsiOutputApplicationListenerTests { props.put("spring.output.ansi.enabled", "never"); application.setDefaultProperties(props); application.run(); - assertThat(AnsiOutput.getEnabled(), equalTo(Enabled.NEVER)); + assertThat(AnsiOutputEnabledValue.get(), equalTo(Enabled.NEVER)); } @Test @@ -75,7 +78,7 @@ public class AnsiOutputApplicationListenerTests { application.setWebEnvironment(false); application.setEnvironment(environment); application.run(); - assertThat(AnsiOutput.getEnabled(), equalTo(Enabled.NEVER)); + assertThat(AnsiOutputEnabledValue.get(), equalTo(Enabled.NEVER)); } @Configuration