From ef9048e86e8eb74fdd7e63ebe52ecb5a6a448ee9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 12 Feb 2014 17:04:42 -0800 Subject: [PATCH] Rename EnvironmentDelegate -> Delegating Rename EnvironmentDelegateApplicationContextInitializer to DelegatingApplicationListener and EnvironmentDelegateApplicationListener to DelegatingApplicationListener. --- ....java => DelegatingApplicationContextInitializer.java} | 2 +- ...onListener.java => DelegatingApplicationListener.java} | 2 +- spring-boot/src/main/resources/META-INF/spring.factories | 4 ++-- ... => DelegatingApplicationContextInitializerTests.java} | 8 ++++---- ...Tests.java => DelegatingApplicationListenerTests.java} | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename spring-boot/src/main/java/org/springframework/boot/context/config/{EnvironmentDelegateApplicationContextInitializer.java => DelegatingApplicationContextInitializer.java} (98%) rename spring-boot/src/main/java/org/springframework/boot/context/config/{EnvironmentDelegateApplicationListener.java => DelegatingApplicationListener.java} (98%) rename spring-boot/src/test/java/org/springframework/boot/context/config/{EnvironmentDelegateApplicationContextInitializerTests.java => DelegatingApplicationContextInitializerTests.java} (92%) rename spring-boot/src/test/java/org/springframework/boot/context/config/{EnvironmentDelegateApplicationListenerTests.java => DelegatingApplicationListenerTests.java} (92%) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializer.java rename to spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java index 4f14c31a6fc..88c58b0fbf0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Phillip Webb */ -public class EnvironmentDelegateApplicationContextInitializer implements +public class DelegatingApplicationContextInitializer implements ApplicationContextInitializer, Ordered { // NOTE: Similar to org.springframework.web.context.ContextLoader diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java similarity index 98% rename from spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListener.java rename to spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java index fa4997290d4..e8a87290cbb 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Phillip Webb */ -public class EnvironmentDelegateApplicationListener implements +public class DelegatingApplicationListener implements ApplicationListener, Ordered { // NOTE: Similar to org.springframework.web.context.ContextLoader diff --git a/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot/src/main/resources/META-INF/spring.factories index 3e701c877df..a65a237950a 100644 --- a/spring-boot/src/main/resources/META-INF/spring.factories +++ b/spring-boot/src/main/resources/META-INF/spring.factories @@ -10,7 +10,7 @@ org.springframework.boot.context.event.EventPublishingRunParticipant # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ org.springframework.boot.context.ContextIdApplicationContextInitializer,\ -org.springframework.boot.context.config.EnvironmentDelegateApplicationContextInitializer +org.springframework.boot.context.config.DelegatingApplicationContextInitializer # Application Listeners org.springframework.context.ApplicationListener=\ @@ -18,7 +18,7 @@ org.springframework.boot.builder.ParentContextCloserApplicationListener,\ org.springframework.boot.cloudfoundry.VcapApplicationListener,\ org.springframework.boot.context.FileEncodingApplicationListener,\ org.springframework.boot.context.config.ConfigFileApplicationListener,\ -org.springframework.boot.context.config.EnvironmentDelegateApplicationListener,\ +org.springframework.boot.context.config.DelegatingApplicationListener,\ 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/config/EnvironmentDelegateApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java similarity index 92% rename from spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java index 2d24cba92c9..2e768916150 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.context.config; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.context.config.EnvironmentDelegateApplicationContextInitializer; +import org.springframework.boot.context.config.DelegatingApplicationContextInitializer; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextInitializer; @@ -33,16 +33,16 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; /** - * Tests for {@link EnvironmentDelegateApplicationContextInitializer}. + * Tests for {@link DelegatingApplicationContextInitializer}. * * @author Phillip Webb */ -public class EnvironmentDelegateApplicationContextInitializerTests { +public class DelegatingApplicationContextInitializerTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private final EnvironmentDelegateApplicationContextInitializer initializer = new EnvironmentDelegateApplicationContextInitializer(); + private final DelegatingApplicationContextInitializer initializer = new DelegatingApplicationContextInitializer(); @Test public void orderedInitialize() throws Exception { diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java similarity index 92% rename from spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListenerTests.java rename to spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java index dd5c4f46a27..6208f81347e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java @@ -21,7 +21,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.config.EnvironmentDelegateApplicationListener; +import org.springframework.boot.context.config.DelegatingApplicationListener; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.ApplicationListener; @@ -35,16 +35,16 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; /** - * Tests for {@link EnvironmentDelegateApplicationListener}. + * Tests for {@link DelegatingApplicationListener}. * * @author Dave Syer */ -public class EnvironmentDelegateApplicationListenerTests { +public class DelegatingApplicationListenerTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private final EnvironmentDelegateApplicationListener listener = new EnvironmentDelegateApplicationListener(); + private final DelegatingApplicationListener listener = new DelegatingApplicationListener(); private final StaticApplicationContext context = new StaticApplicationContext();