SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.

Browse Source 
Swaps with ConditionalOnAvailableEndpoint
This commit is contained in:
Spencer Gibb
2020-01-17 15:45:03 -05:00
parent b6ddff7d2e
commit 8b53f2862a
8 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java
View File

@@ -63,7 +63,8 @@ public class LifecycleMvcAutoConfigurationTests {
@Test
public void environmentWebEndpointExtensionEnabled() {
beanCreated("environmentEndpointWebExtension",
"management.endpoint.env.enabled=true");
"management.endpoint.env.enabled=true",
"management.endpoints.web.exposure.include=env");
}
// restartEndpoint
@@ -80,7 +81,8 @@ public class LifecycleMvcAutoConfigurationTests {
@Test
public void restartEndpointEnabled() {
beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class,
RestartEndpoint::restart, "management.endpoint.restart.enabled=true");
RestartEndpoint::restart, "management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart");
}
// pauseEndpoint
@@ -105,6 +107,7 @@ public class LifecycleMvcAutoConfigurationTests {
beanCreatedAndEndpointEnabled("pauseEndpoint",
RestartEndpoint.PauseEndpoint.class, RestartEndpoint.PauseEndpoint::pause,
"management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart,pause",
"management.endpoint.pause.enabled=true");
}
@@ -112,12 +115,14 @@ public class LifecycleMvcAutoConfigurationTests {
@Test
public void resumeEndpointDisabled() {
beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart",
"management.endpoint.resume.enabled=false");
}
@Test
public void resumeEndpointRestartDisabled() {
beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=false",
"management.endpoints.web.exposure.include=resume",
"management.endpoint.resume.enabled=true");
}
@@ -132,7 +137,8 @@ public class LifecycleMvcAutoConfigurationTests {
RestartEndpoint.ResumeEndpoint.class,
RestartEndpoint.ResumeEndpoint::resume,
"management.endpoint.restart.enabled=true",
"management.endpoint.resume.enabled=true");
"management.endpoint.resume.enabled=true",
"management.endpoints.web.exposure.include=restart,resume");
}
private void beanNotCreated(String beanName, String... contextProperties) {

1
spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
View File

@@ -47,6 +47,7 @@ public class RestartIntegrationTests {
this.context = SpringApplication.run(TestConfiguration.class,
"--management.endpoint.restart.enabled=true", "--server.port=0",
"--management.endpoints.web.exposure.include=restart",
"--spring.liveBeansView.mbeanDomain=livebeans");
RestartEndpoint endpoint = this.context.getBean(RestartEndpoint.class);