From 37c2c89bcb8968e8f4ae5035dc2548da3bf2f625 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 5 Feb 2014 10:06:09 -0800 Subject: [PATCH] Restructure packages Improve package structure and attempt to co-locate related classes. --- .../boot/actuate/endpoint/BeansEndpoint.java | 4 ++-- .../SecurityAutoConfigurationTests.java | 2 +- .../builder/SpringApplicationBuilder.java | 4 ++-- .../VcapApplicationListener.java | 6 +++--- .../ConfigFileApplicationListener.java | 5 +---- .../boot/config/YamlPropertySourceLoader.java | 7 +++++-- ...ontextIdApplicationContextInitializer.java | 2 +- .../FileEncodingApplicationListener.java | 2 +- ...tContextApplicationContextInitializer.java | 2 +- ...arentContextCloserApplicationListener.java | 6 +++--- ...DelegateApplicationContextInitializer.java | 2 +- ...nvironmentDelegateApplicationListener.java | 2 +- ...tContextApplicationContextInitializer.java | 2 +- .../{config => json}/JacksonJsonParser.java | 2 +- .../boot/{config => json}/JsonParser.java | 2 +- .../{config => json}/JsonParserFactory.java | 2 +- .../{config => json}/SimpleJsonParser.java | 2 +- .../boot/{config => json}/YamlJsonParser.java | 2 +- .../ClasspathLoggingApplicationListener.java | 2 +- .../LoggingApplicationListener.java | 4 +--- .../test/SpringApplicationContextLoader.java | 2 +- .../web/SpringBootServletInitializer.java | 4 ++-- .../ArrayDocumentMatcher.java | 6 +++--- .../DefaultProfileDocumentMatcher.java | 6 +++--- .../SpringProfileDocumentMatcher.java | 6 +++--- .../{config => yaml}/YamlMapFactoryBean.java | 2 +- .../boot/{config => yaml}/YamlProcessor.java | 2 +- .../YamlPropertiesFactoryBean.java | 2 +- .../main/resources/META-INF/spring.factories | 20 +++++++++---------- .../VcapApplicationListenerTests.java | 3 ++- .../ConfigFileApplicationListenerTests.java | 3 ++- ...tIdApplicationContextInitializerTests.java | 3 ++- .../FileEncodingApplicationListenerTests.java | 3 ++- ...ateApplicationContextInitializerTests.java | 3 ++- ...nmentDelegateApplicationListenerTests.java | 8 +++++++- .../{config => json}/JacksonParserTests.java | 5 ++++- .../SimpleJsonParserTests.java | 4 +++- .../{config => json}/YamlJsonParserTests.java | 5 ++++- .../LoggingApplicationListenerTests.java | 3 ++- .../ArrayDocumentMatcherTests.java | 5 +++-- .../YamlMapFactoryBeanTests.java | 5 +++-- .../{config => yaml}/YamlProcessorTests.java | 5 +++-- .../YamlPropertiesFactoryBeanTests.java | 9 +++++---- 43 files changed, 99 insertions(+), 77 deletions(-) rename spring-boot/src/main/java/org/springframework/boot/{context/listener => cloudfoundry}/VcapApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/{context/listener => config}/ConfigFileApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{initializer => }/ContextIdApplicationContextInitializer.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{listener => }/FileEncodingApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{initializer => }/ParentContextApplicationContextInitializer.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{listener => }/ParentContextCloserApplicationListener.java (92%) rename spring-boot/src/main/java/org/springframework/boot/context/{initializer => env}/EnvironmentDelegateApplicationContextInitializer.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{listener => env}/EnvironmentDelegateApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/context/{initializer => web}/ServletContextApplicationContextInitializer.java (96%) rename spring-boot/src/main/java/org/springframework/boot/{config => json}/JacksonJsonParser.java (97%) rename spring-boot/src/main/java/org/springframework/boot/{config => json}/JsonParser.java (96%) rename spring-boot/src/main/java/org/springframework/boot/{config => json}/JsonParserFactory.java (97%) rename spring-boot/src/main/java/org/springframework/boot/{config => json}/SimpleJsonParser.java (99%) rename spring-boot/src/main/java/org/springframework/boot/{config => json}/YamlJsonParser.java (96%) rename spring-boot/src/main/java/org/springframework/boot/{context/listener => logging}/ClasspathLoggingApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/{context/listener => logging}/LoggingApplicationListener.java (98%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/ArrayDocumentMatcher.java (90%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/DefaultProfileDocumentMatcher.java (86%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/SpringProfileDocumentMatcher.java (90%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/YamlMapFactoryBean.java (98%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/YamlProcessor.java (99%) rename spring-boot/src/main/java/org/springframework/boot/{config => yaml}/YamlPropertiesFactoryBean.java (98%) rename spring-boot/src/test/java/org/springframework/boot/{context/listener => cloudfoundry}/VcapApplicationListenerTests.java (97%) rename spring-boot/src/test/java/org/springframework/boot/{context/listener => config}/ConfigFileApplicationListenerTests.java (99%) rename spring-boot/src/test/java/org/springframework/boot/context/{initializer => }/ContextIdApplicationContextInitializerTests.java (95%) rename spring-boot/src/test/java/org/springframework/boot/context/{listener => }/FileEncodingApplicationListenerTests.java (94%) rename spring-boot/src/test/java/org/springframework/boot/context/{initializer => env}/EnvironmentDelegateApplicationContextInitializerTests.java (97%) rename spring-boot/src/test/java/org/springframework/boot/context/{listener => env}/EnvironmentDelegateApplicationListenerTests.java (94%) rename spring-boot/src/test/java/org/springframework/boot/{config => json}/JacksonParserTests.java (85%) rename spring-boot/src/test/java/org/springframework/boot/{config => json}/SimpleJsonParserTests.java (94%) rename spring-boot/src/test/java/org/springframework/boot/{config => json}/YamlJsonParserTests.java (85%) rename spring-boot/src/test/java/org/springframework/boot/{context/listener => logging}/LoggingApplicationListenerTests.java (98%) rename spring-boot/src/test/java/org/springframework/boot/{config => yaml}/ArrayDocumentMatcherTests.java (92%) rename spring-boot/src/test/java/org/springframework/boot/{config => yaml}/YamlMapFactoryBeanTests.java (95%) rename spring-boot/src/test/java/org/springframework/boot/{config => yaml}/YamlProcessorTests.java (96%) rename spring-boot/src/test/java/org/springframework/boot/{config => yaml}/YamlPropertiesFactoryBeanTests.java (96%) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java index 3d5542d0322..12178983e48 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java @@ -19,9 +19,9 @@ package org.springframework.boot.actuate.endpoint; import java.util.List; import org.springframework.beans.BeansException; -import org.springframework.boot.config.JsonParser; -import org.springframework.boot.config.JsonParserFactory; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.json.JsonParser; +import org.springframework.boot.json.JsonParserFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.LiveBeansView; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 49c5406f3bb..d9baf27d906 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; -import org.springframework.boot.context.listener.LoggingApplicationListener; import org.springframework.boot.event.ApplicationPreparedEvent; +import org.springframework.boot.logging.LoggingApplicationListener; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java index 4a802e7104e..e160e94d1c9 100644 --- a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java @@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.boot.ProfileDetector; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.initializer.ParentContextApplicationContextInitializer; -import org.springframework.boot.context.initializer.ServletContextApplicationContextInitializer; +import org.springframework.boot.context.ParentContextApplicationContextInitializer; +import org.springframework.boot.context.web.ServletContextApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ApplicationListener; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/VcapApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/VcapApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java index 5f03ce87b1a..90afc386710 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/VcapApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.cloudfoundry; import java.util.Collection; import java.util.Collections; @@ -26,9 +26,9 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.config.JsonParser; -import org.springframework.boot.config.JsonParserFactory; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; +import org.springframework.boot.json.JsonParser; +import org.springframework.boot.json.JsonParserFactory; import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; import org.springframework.core.env.CommandLinePropertySource; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/config/ConfigFileApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/ConfigFileApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/config/ConfigFileApplicationListener.java index eefedd4c1de..2a0b9fad405 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/ConfigFileApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/config/ConfigFileApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.config; import java.util.ArrayList; import java.util.Arrays; @@ -33,9 +33,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.bind.PropertySourcesPropertyValues; import org.springframework.boot.bind.RelaxedDataBinder; -import org.springframework.boot.config.DefaultPropertySourceLoadersFactory; -import org.springframework.boot.config.PropertySourceLoader; -import org.springframework.boot.config.PropertySourceLoadersFactory; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java index 63e607aa482..43bb4eedbae 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertySourceLoader.java @@ -22,8 +22,11 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.springframework.boot.config.YamlProcessor.DocumentMatcher; -import org.springframework.boot.config.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.DefaultProfileDocumentMatcher; +import org.springframework.boot.yaml.SpringProfileDocumentMatcher; +import org.springframework.boot.yaml.YamlPropertiesFactoryBean; +import org.springframework.boot.yaml.YamlProcessor.DocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; import org.springframework.core.env.PropertySource; import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java index 98cba8cc10a..dfba4aa5b75 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/FileEncodingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/FileEncodingApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java index 62e3b9a7590..ac8d4836be3 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/FileEncodingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.context; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ParentContextApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ParentContextApplicationContextInitializer.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/initializer/ParentContextApplicationContextInitializer.java rename to spring-boot/src/main/java/org/springframework/boot/context/ParentContextApplicationContextInitializer.java index cc40517457a..7b13cf97ff6 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ParentContextApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ParentContextApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/ParentContextCloserApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/ParentContextCloserApplicationListener.java similarity index 92% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/ParentContextCloserApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/context/ParentContextCloserApplicationListener.java index f8b6d3d5d2c..b161ea979aa 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/ParentContextCloserApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ParentContextCloserApplicationListener.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.context; -import org.springframework.boot.context.initializer.ParentContextApplicationContextInitializer.ParentContextAvailableEvent; +import org.springframework.boot.context.ParentContextApplicationContextInitializer.ParentContextAvailableEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.event.ContextClosedEvent; @@ -71,4 +71,4 @@ public class ParentContextCloserApplicationListener implements } -} \ No newline at end of file +} diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java index e9e5ef4d089..6a94a31d7ba 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context.env; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java index 6119631b14a..270c0b26301 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.context.env; import java.util.ArrayList; import java.util.List; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ServletContextApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java similarity index 96% rename from spring-boot/src/main/java/org/springframework/boot/context/initializer/ServletContextApplicationContextInitializer.java rename to spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java index 3f175f3a545..1b730280008 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ServletContextApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context.web; import javax.servlet.ServletContext; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java similarity index 97% rename from spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java rename to spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java index 7f86940bbd8..4be3a21e5da 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/JacksonJsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import java.util.List; import java.util.Map; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java similarity index 96% rename from spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java rename to spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java index a28f6cba409..1ee7470052e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/JsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import java.util.List; import java.util.Map; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java similarity index 97% rename from spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java rename to spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java index 5b80d3f964b..350c899e097 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/JsonParserFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import org.springframework.util.ClassUtils; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/SimpleJsonParser.java similarity index 99% rename from spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java rename to spring-boot/src/main/java/org/springframework/boot/json/SimpleJsonParser.java index f9b79d9086f..0574789d7ea 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/SimpleJsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/SimpleJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/YamlJsonParser.java similarity index 96% rename from spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java rename to spring-boot/src/main/java/org/springframework/boot/json/YamlJsonParser.java index dd32f4f2b03..c4fa20c88d0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/YamlJsonParser.java +++ b/spring-boot/src/main/java/org/springframework/boot/json/YamlJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import java.util.List; import java.util.Map; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/ClasspathLoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/ClasspathLoggingApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java index 94841e9daba..ae28369d2fc 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/ClasspathLoggingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.logging; import java.net.URLClassLoader; import java.util.Arrays; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/listener/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/listener/LoggingApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java index 900d836c8a4..1433810fc5c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/listener/LoggingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.logging; import java.lang.management.ManagementFactory; import java.util.Arrays; @@ -28,8 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.event.ApplicationStartedEvent; -import org.springframework.boot.logging.LogLevel; -import org.springframework.boot.logging.LoggingSystem; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.event.SmartApplicationListener; diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java index 256552d67ff..303e18a4499 100644 --- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java @@ -26,7 +26,7 @@ import java.util.Set; import org.springframework.beans.BeanUtils; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.initializer.ServletContextApplicationContextInitializer; +import org.springframework.boot.context.web.ServletContextApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.mock.web.MockServletContext; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java index 6588e8ecda6..621a7037e21 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/SpringBootServletInitializer.java @@ -23,9 +23,9 @@ import javax.servlet.ServletException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.ParentContextApplicationContextInitializer; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.boot.context.initializer.ParentContextApplicationContextInitializer; -import org.springframework.boot.context.initializer.ServletContextApplicationContextInitializer; +import org.springframework.boot.context.web.ServletContextApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java similarity index 90% rename from spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java index 58eaa54b56a..dade269bd9a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/ArrayDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Properties; import java.util.Set; -import org.springframework.boot.config.YamlProcessor.DocumentMatcher; -import org.springframework.boot.config.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.YamlProcessor.DocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; import org.springframework.util.StringUtils; /** diff --git a/spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java similarity index 86% rename from spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java index aae5400af8c..18e9cc520da 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/DefaultProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Properties; -import org.springframework.boot.config.YamlProcessor.DocumentMatcher; -import org.springframework.boot.config.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.YamlProcessor.DocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; /** * A {@link DocumentMatcher} that matches the default profile implicitly but not diff --git a/spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java similarity index 90% rename from spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java index 6574af2550e..15724a9ab99 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/SpringProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Properties; -import org.springframework.boot.config.YamlProcessor.DocumentMatcher; -import org.springframework.boot.config.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.YamlProcessor.DocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; import org.springframework.core.env.Environment; /** diff --git a/spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlMapFactoryBean.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/YamlMapFactoryBean.java index 76dfdada6f9..67c5cf9604f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/YamlMapFactoryBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlMapFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlProcessor.java similarity index 99% rename from spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/YamlProcessor.java index 496e8ade378..0a1e623f2ce 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/YamlProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.io.IOException; import java.util.Collection; diff --git a/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java rename to spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java index cbe023bbce5..b0d2770a3c0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/config/YamlPropertiesFactoryBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Map; import java.util.Properties; diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories index 2ef15fb4288..924e4d76f0e 100644 --- a/spring-boot/src/main/resources/META-INF/spring.factories +++ b/spring-boot/src/main/resources/META-INF/spring.factories @@ -4,17 +4,17 @@ org.springframework.boot.event.EventPublishingRunParticipant # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ -org.springframework.boot.context.initializer.ContextIdApplicationContextInitializer,\ -org.springframework.boot.context.initializer.EnvironmentDelegateApplicationContextInitializer +org.springframework.boot.context.ContextIdApplicationContextInitializer,\ +org.springframework.boot.context.env.EnvironmentDelegateApplicationContextInitializer # Application Listeners org.springframework.context.ApplicationListener=\ -org.springframework.boot.context.listener.ClasspathLoggingApplicationListener,\ -org.springframework.boot.context.listener.ConfigFileApplicationListener,\ -org.springframework.boot.context.listener.EnvironmentDelegateApplicationListener,\ -org.springframework.boot.context.listener.FileEncodingApplicationListener,\ -org.springframework.boot.context.listener.LoggingApplicationListener,\ -org.springframework.boot.context.listener.VcapApplicationListener,\ -org.springframework.boot.context.listener.ParentContextCloserApplicationListener,\ -org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener +org.springframework.boot.cloudfoundry.VcapApplicationListener,\ +org.springframework.boot.config.ConfigFileApplicationListener,\ +org.springframework.boot.context.FileEncodingApplicationListener,\ +org.springframework.boot.context.ParentContextCloserApplicationListener,\ +org.springframework.boot.context.env.EnvironmentDelegateApplicationListener,\ +org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener,\ +org.springframework.boot.logging.ClasspathLoggingApplicationListener,\ +org.springframework.boot.logging.LoggingApplicationListener diff --git a/spring-boot/src/test/java/org/springframework/boot/context/listener/VcapApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java similarity index 97% rename from spring-boot/src/test/java/org/springframework/boot/context/listener/VcapApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java index 7799af255af..50f90c7d86a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/listener/VcapApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/cloudfoundry/VcapApplicationListenerTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.cloudfoundry; import org.junit.Test; import org.springframework.boot.SpringApplication; +import org.springframework.boot.cloudfoundry.VcapApplicationListener; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/listener/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/config/ConfigFileApplicationListenerTests.java similarity index 99% rename from spring-boot/src/test/java/org/springframework/boot/context/listener/ConfigFileApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/config/ConfigFileApplicationListenerTests.java index 250a4032c29..4c249a09f46 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/listener/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/config/ConfigFileApplicationListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.config; import java.util.Arrays; import java.util.List; @@ -24,6 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.boot.SpringApplication; +import org.springframework.boot.config.ConfigFileApplicationListener; import org.springframework.boot.config.PropertySourceLoader; import org.springframework.boot.config.PropertySourceLoadersFactory; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/ContextIdApplicationContextInitializerTests.java similarity index 95% rename from spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/ContextIdApplicationContextInitializerTests.java index fd6aa2beeb6..86a4bcc2387 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/ContextIdApplicationContextInitializerTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context; import org.junit.Test; +import org.springframework.boot.context.ContextIdApplicationContextInitializer; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/listener/FileEncodingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java similarity index 94% rename from spring-boot/src/test/java/org/springframework/boot/context/listener/FileEncodingApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java index 04ee16834fb..0535ba99d32 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/listener/FileEncodingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.context; import org.junit.Assume; import org.junit.Test; import org.springframework.boot.SpringApplication; +import org.springframework.boot.context.FileEncodingApplicationListener; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializerTests.java similarity index 97% rename from spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializerTests.java index d25a7631658..a59efcc8a5b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/initializer/EnvironmentDelegateApplicationContextInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializerTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.context.initializer; +package org.springframework.boot.context.env; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.context.env.EnvironmentDelegateApplicationContextInitializer; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListenerTests.java similarity index 94% rename from spring-boot/src/test/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListenerTests.java index a7b7ccfdb0f..8b26078fa6d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/listener/EnvironmentDelegateApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListenerTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.context.env; import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.boot.SpringApplication; +import org.springframework.boot.context.env.EnvironmentDelegateApplicationListener; import org.springframework.boot.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ApplicationListener; @@ -33,6 +34,11 @@ import org.springframework.core.annotation.Order; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; +/** + * Tests for {@link EnvironmentDelegateApplicationListener}. + * + * @author Dave Syer + */ public class EnvironmentDelegateApplicationListenerTests { @Rule diff --git a/spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/json/JacksonParserTests.java similarity index 85% rename from spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java rename to spring-boot/src/test/java/org/springframework/boot/json/JacksonParserTests.java index 8a52fb9cbf6..c01603b4547 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/JacksonParserTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/json/JacksonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; + +import org.springframework.boot.json.JacksonJsonParser; +import org.springframework.boot.json.JsonParser; /** * Tests for {@link JsonParser}. diff --git a/spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/json/SimpleJsonParserTests.java similarity index 94% rename from spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java rename to spring-boot/src/test/java/org/springframework/boot/json/SimpleJsonParserTests.java index d7ba93d98a6..c07930f95a2 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/SimpleJsonParserTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/json/SimpleJsonParserTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; import java.util.List; import java.util.Map; import org.junit.Test; +import org.springframework.boot.json.JsonParser; +import org.springframework.boot.json.SimpleJsonParser; import static org.junit.Assert.assertEquals; diff --git a/spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/json/YamlJsonParserTests.java similarity index 85% rename from spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java rename to spring-boot/src/test/java/org/springframework/boot/json/YamlJsonParserTests.java index 96c3898efb9..b89f98faea9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/YamlJsonParserTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/json/YamlJsonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.json; + +import org.springframework.boot.json.JsonParser; +import org.springframework.boot.json.YamlJsonParser; /** * Tests for {@link YamlJsonParser}. diff --git a/spring-boot/src/test/java/org/springframework/boot/context/listener/LoggingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java similarity index 98% rename from spring-boot/src/test/java/org/springframework/boot/context/listener/LoggingApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java index d4f54ce0cfd..604743c701d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/listener/LoggingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.context.listener; +package org.springframework.boot.logging; import java.io.File; import java.io.IOException; @@ -31,6 +31,7 @@ import org.junit.rules.TemporaryFolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.event.ApplicationStartedEvent; import org.springframework.boot.logging.LogLevel; +import org.springframework.boot.logging.LoggingApplicationListener; import org.springframework.boot.logging.java.JavaLoggingSystem; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.OutputCapture; diff --git a/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/yaml/ArrayDocumentMatcherTests.java similarity index 92% rename from spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java rename to spring-boot/src/test/java/org/springframework/boot/yaml/ArrayDocumentMatcherTests.java index 16450ac4fb0..b783e0b5676 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/ArrayDocumentMatcherTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/yaml/ArrayDocumentMatcherTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.io.IOException; import java.util.Properties; import org.junit.Test; -import org.springframework.boot.config.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.ArrayDocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; diff --git a/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlMapFactoryBeanTests.java similarity index 95% rename from spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java rename to spring-boot/src/test/java/org/springframework/boot/yaml/YamlMapFactoryBeanTests.java index 8bffe4cb073..90f40855439 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/YamlMapFactoryBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlMapFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.io.IOException; import java.io.InputStream; @@ -22,7 +22,8 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; -import org.springframework.boot.config.YamlProcessor.ResolutionMethod; +import org.springframework.boot.yaml.YamlMapFactoryBean; +import org.springframework.boot.yaml.YamlProcessor.ResolutionMethod; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; diff --git a/spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlProcessorTests.java similarity index 96% rename from spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java rename to spring-boot/src/test/java/org/springframework/boot/yaml/YamlProcessorTests.java index d593f7f7586..02c5b65200a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/YamlProcessorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlProcessorTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Map; import java.util.Properties; @@ -21,7 +21,8 @@ import java.util.Properties; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.config.YamlProcessor.MatchCallback; +import org.springframework.boot.yaml.YamlProcessor; +import org.springframework.boot.yaml.YamlProcessor.MatchCallback; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.yaml.snakeyaml.parser.ParserException; diff --git a/spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlPropertiesFactoryBeanTests.java similarity index 96% rename from spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java rename to spring-boot/src/test/java/org/springframework/boot/yaml/YamlPropertiesFactoryBeanTests.java index 8fe701633db..657f2d57f30 100644 --- a/spring-boot/src/test/java/org/springframework/boot/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/yaml/YamlPropertiesFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.config; +package org.springframework.boot.yaml; import java.util.Arrays; import java.util.Map; @@ -24,9 +24,10 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.config.YamlProcessor.DocumentMatcher; -import org.springframework.boot.config.YamlProcessor.MatchStatus; -import org.springframework.boot.config.YamlProcessor.ResolutionMethod; +import org.springframework.boot.yaml.YamlPropertiesFactoryBean; +import org.springframework.boot.yaml.YamlProcessor.DocumentMatcher; +import org.springframework.boot.yaml.YamlProcessor.MatchStatus; +import org.springframework.boot.yaml.YamlProcessor.ResolutionMethod; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource;