From f758a4ddd5cee5cefcc98ed916d9438204e1a7f7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 13 Mar 2018 14:11:42 +0000 Subject: [PATCH] Do not link to controller endpoints in Jersey-based Actuator Closes gh-12463 --- .../JerseyWebEndpointManagementContextConfiguration.java | 2 -- .../integrationtest/JerseyEndpointIntegrationTests.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java index 55a3c51ecd..39f753c41a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java @@ -62,13 +62,11 @@ class JerseyWebEndpointManagementContextConfiguration { public ResourceConfigCustomizer webEndpointRegistrar( WebEndpointsSupplier webEndpointsSupplier, ServletEndpointsSupplier servletEndpointsSupplier, - ControllerEndpointsSupplier controllerEndpointsSupplier, EndpointMediaTypes endpointMediaTypes, WebEndpointProperties webEndpointProperties) { List> allEndpoints = new ArrayList<>(); allEndpoints.addAll(webEndpointsSupplier.getEndpoints()); allEndpoints.addAll(servletEndpointsSupplier.getEndpoints()); - allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints()); return (resourceConfig) -> { JerseyEndpointResourceFactory resourceFactory = new JerseyEndpointResourceFactory(); String basePath = webEndpointProperties.getBasePath(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java index ce6f991d7c..5e74d7ef10 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java @@ -65,8 +65,8 @@ public class JerseyEndpointIntegrationTests { .baseUrl("http://localhost:" + port).build(); client.get().uri("/actuator").exchange().expectStatus().isOk() .expectBody().jsonPath("_links.beans").isNotEmpty() - .jsonPath("_links.restcontroller").isNotEmpty() - .jsonPath("_links.controller").isNotEmpty(); + .jsonPath("_links.restcontroller").doesNotExist() + .jsonPath("_links.controller").doesNotExist(); }); }