From a8e90681b774403b04bc39418ce62d73dcd6b07c Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 31 May 2018 12:57:36 -0400 Subject: [PATCH] Renames environmentWebEndpointExtension to environmentEndpointWebExtension. This matches boot, even though the boot bean shouldn't be created because of a @ConditionalOnMissingBean see gh-374 --- ...eEnvironmentEndpointAutoConfiguration.java | 2 +- .../LifecycleMvcAutoConfigurationTests.java | 2 +- .../EnvironmentManagerIntegrationTests.java | 23 ++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index f3c7a5d2..dedfb4e2 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -54,7 +54,7 @@ public class WritableEnvironmentEndpointAutoConfiguration { @Bean @ConditionalOnEnabledEndpoint - public WritableEnvironmentEndpointWebExtension environmentWebEndpointExtension( + public WritableEnvironmentEndpointWebExtension environmentEndpointWebExtension( WritableEnvironmentEndpoint endpoint, EnvironmentManager environment) { return new WritableEnvironmentEndpointWebExtension(endpoint, environment); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java index 67d5ea64..440c31ff 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java @@ -38,7 +38,7 @@ public class LifecycleMvcAutoConfigurationTests { @Test public void environmentWebEndpointExtensionEnabled() { - beanCreated("environmentWebEndpointExtension", + beanCreated("environmentEndpointWebExtension", "management.endpoint.env.enabled=true"); } diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java index d1e08287..497e924f 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java @@ -24,23 +24,26 @@ import javax.servlet.ServletException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.env.EnvironmentEndpoint; +import org.springframework.boot.actuate.env.EnvironmentEndpointWebExtension; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.context.environment.EnvironmentManagerIntegrationTests.TestConfiguration; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -64,6 +67,9 @@ public class EnvironmentManagerIntegrationTests { @Autowired private MockMvc mvc; + @Autowired + private ApplicationContext context; + @Test public void testRefresh() throws Exception { assertEquals("Hello scope!", properties.getMessage()); @@ -108,6 +114,21 @@ public class EnvironmentManagerIntegrationTests { .andExpect(status().isNotFound()); } + @Test + public void environmentBeansConfiguredCorrectly() { + Map envbeans = this.context.getBeansOfType(EnvironmentEndpoint.class); + assertThat(envbeans).hasSize(1) + .containsKey("environmentEndpoint"); + assertThat(envbeans.get("environmentEndpoint")) + .isInstanceOf(WritableEnvironmentEndpoint.class); + + Map extbeans = this.context.getBeansOfType(EnvironmentEndpointWebExtension.class); + assertThat(extbeans).hasSize(1) + .containsKey("environmentEndpointWebExtension"); + assertThat(extbeans.get("environmentEndpointWebExtension")) + .isInstanceOf(WritableEnvironmentEndpointWebExtension.class); + } + @Configuration @EnableAutoConfiguration protected static class TestConfiguration {