Skip to content

Commit 85107d7

Browse files
berruetaRobWin
authored andcommitted
Change endpoint names to ensure compatibility with future SB releases (ReactiveX#300)
* ReactiveX#286: Change endpoint names to ensure compatibility with future SB releases Since Spring Boot 2.1.x, the applications emit a warning on startup if the endpoint name contains a dash or a dot. Future versions of Spring Boot may ban these symbols completely. * Update tests to reflect new endpoint URL
1 parent 8a0f656 commit 85107d7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/circuitbreaker/monitoring/endpoint/CircuitBreakerEventsEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import io.github.resilience4j.consumer.EventConsumerRegistry;
2828

2929

30-
@Endpoint(id = "circuitbreaker-events")
30+
@Endpoint(id = "circuitbreakerevents")
3131
public class CircuitBreakerEventsEndpoint {
3232

3333
private final EventConsumerRegistry<CircuitBreakerEvent> eventConsumerRegistry;

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/ratelimiter/monitoring/endpoint/RateLimiterEventsEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import io.github.resilience4j.ratelimiter.monitoring.model.RateLimiterEventDTO;
2929
import io.github.resilience4j.ratelimiter.monitoring.model.RateLimiterEventsEndpointResponse;
3030

31-
@Endpoint(id = "ratelimiter-events")
31+
@Endpoint(id = "ratelimiterevents")
3232
public class RateLimiterEventsEndpoint {
3333
private final EventConsumerRegistry<RateLimiterEvent> eventsConsumerRegistry;
3434

resilience4j-spring-boot2/src/test/java/io/github/resilience4j/circuitbreaker/CircuitBreakerAutoConfigurationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public void testCircuitBreakerAutoConfiguration() throws IOException {
9090
assertThat(circuitBreakerList.getBody().getCircuitBreakers()).hasSize(2).containsExactly("backendA", "backendB");
9191

9292
// expect circuitbreaker-event actuator endpoint recorded both events
93-
ResponseEntity<CircuitBreakerEventsEndpointResponse> circuitBreakerEventList = restTemplate.getForEntity("/actuator/circuitbreaker-events", CircuitBreakerEventsEndpointResponse.class);
93+
ResponseEntity<CircuitBreakerEventsEndpointResponse> circuitBreakerEventList = restTemplate.getForEntity("/actuator/circuitbreakerevents", CircuitBreakerEventsEndpointResponse.class);
9494
assertThat(circuitBreakerEventList.getBody().getCircuitBreakerEvents()).hasSize(2);
9595

96-
circuitBreakerEventList = restTemplate.getForEntity("/actuator/circuitbreaker-events?name=backendA", CircuitBreakerEventsEndpointResponse.class);
96+
circuitBreakerEventList = restTemplate.getForEntity("/actuator/circuitbreakerevents?name=backendA", CircuitBreakerEventsEndpointResponse.class);
9797
assertThat(circuitBreakerEventList.getBody().getCircuitBreakerEvents()).hasSize(2);
9898

9999
// expect no health indicator for backendB, as it is disabled via properties

resilience4j-spring-boot2/src/test/java/io/github/resilience4j/ratelimiter/RateLimiterAutoConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void testRateLimiterAutoConfiguration() throws IOException {
105105
}
106106

107107
ResponseEntity<RateLimiterEventsEndpointResponse> rateLimiterEventList = restTemplate
108-
.getForEntity("/actuator/ratelimiter-events", RateLimiterEventsEndpointResponse.class);
108+
.getForEntity("/actuator/ratelimiterevents", RateLimiterEventsEndpointResponse.class);
109109

110110
List<RateLimiterEventDTO> eventsList = rateLimiterEventList.getBody().getEventsList();
111111
assertThat(eventsList).isNotEmpty();

0 commit comments

Comments
 (0)