Browse Source

Rename EnvironmentDelegate -> Delegating

Rename EnvironmentDelegateApplicationContextInitializer to
DelegatingApplicationListener and EnvironmentDelegateApplicationListener
to DelegatingApplicationListener.
pull/352/merge
Phillip Webb 12 years ago
parent
commit
ef9048e86e
  1. 2
      spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java
  2. 2
      spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java
  3. 4
      spring-boot/src/main/resources/META-INF/spring.factories
  4. 8
      spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java
  5. 8
      spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java

2
spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializer.java → spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java

@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @author Phillip Webb
*/
public class EnvironmentDelegateApplicationContextInitializer implements
public class DelegatingApplicationContextInitializer implements
ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {
// NOTE: Similar to org.springframework.web.context.ContextLoader

2
spring-boot/src/main/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListener.java → spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java

@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @author Phillip Webb
*/
public class EnvironmentDelegateApplicationListener implements
public class DelegatingApplicationListener implements
ApplicationListener<ApplicationEvent>, Ordered {
// NOTE: Similar to org.springframework.web.context.ContextLoader

4
spring-boot/src/main/resources/META-INF/spring.factories

@ -10,7 +10,7 @@ org.springframework.boot.context.event.EventPublishingRunParticipant @@ -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,\ @@ -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

8
spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationContextInitializerTests.java → spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java

@ -19,7 +19,7 @@ package org.springframework.boot.context.config; @@ -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; @@ -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 {

8
spring-boot/src/test/java/org/springframework/boot/context/config/EnvironmentDelegateApplicationListenerTests.java → spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java

@ -21,7 +21,7 @@ import org.junit.Rule; @@ -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; @@ -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();
Loading…
Cancel
Save