Skip to content

Commit 63e4e3b

Browse files
drei01spencergibb
authored andcommitted
Allow lifecycle endpoints to be globally disabled using endpoints.enabled property (spring-projects#148)
fixes spring-projectsgh-158
1 parent 10cbe7e commit 63e4e3b

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public ResumeEndpoint getResumeEndpoint() {
114114
return new ResumeEndpoint();
115115
}
116116

117+
@ConfigurationProperties("endpoints")
117118
public class PauseEndpoint extends AbstractEndpoint<Boolean> {
118119

119120
public PauseEndpoint() {
@@ -130,6 +131,7 @@ public Boolean invoke() {
130131
}
131132
}
132133

134+
@ConfigurationProperties("endpoints")
133135
public class ResumeEndpoint extends AbstractEndpoint<Boolean> {
134136

135137
public ResumeEndpoint() {

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package org.springframework.cloud.autoconfigure;
22

3+
import static org.hamcrest.Matchers.equalTo;
4+
import static org.hamcrest.Matchers.instanceOf;
5+
import static org.hamcrest.Matchers.is;
6+
import static org.junit.Assert.assertThat;
7+
38
import org.junit.Test;
49
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
510
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -10,11 +15,6 @@
1015
import org.springframework.http.HttpStatus;
1116
import org.springframework.http.ResponseEntity;
1217

13-
import static org.hamcrest.Matchers.equalTo;
14-
import static org.hamcrest.Matchers.instanceOf;
15-
import static org.hamcrest.Matchers.is;
16-
import static org.junit.Assert.assertThat;
17-
1818
/**
1919
* @author Spencer Gibb
2020
*/
@@ -44,6 +44,21 @@ public void resumeMvcEndpointDisabled() {
4444
public void restartMvcEndpointDisabled() {
4545
endpointDisabled("endpoints.restart.enabled", "restartMvcEndpoint");
4646
}
47+
48+
@Test
49+
public void pauseMvcEndpointGloballyDisabled() {
50+
endpointDisabled("endpoints.enabled", "pauseMvcEndpoint");
51+
}
52+
53+
@Test
54+
public void resumeMvcEndpointGloballyDisabled() {
55+
endpointDisabled("endpoints.enabled", "resumeMvcEndpoint");
56+
}
57+
58+
@Test
59+
public void restartMvcEndpointGloballyDisabled() {
60+
endpointDisabled("endpoints.enabled", "restartMvcEndpoint");
61+
}
4762

4863
private void endpointDisabled(String enabledProp, String beanName) {
4964
try (ConfigurableApplicationContext context = getApplicationContext(Config.class,

0 commit comments

Comments
 (0)