From dccf378d493928d062af23435005100598b8f56f Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 31 Oct 2023 09:57:41 +0100 Subject: [PATCH] Polish CloudFoundryActuatorAutoConfiguration --- .../servlet/CloudFoundryActuatorAutoConfiguration.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java index 35ba2cab29e..08a688c53be 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java @@ -67,7 +67,6 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.OrRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import org.springframework.util.CollectionUtils; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.servlet.DispatcherServlet; @@ -125,8 +124,8 @@ public class CloudFoundryActuatorAutoConfiguration { allEndpoints.addAll(webEndpoints); allEndpoints.addAll(servletEndpointsSupplier.getEndpoints()); allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints()); - return new CloudFoundryWebEndpointServletHandlerMapping(new EndpointMapping("/cloudfoundryapplication"), - webEndpoints, endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints); + return new CloudFoundryWebEndpointServletHandlerMapping(new EndpointMapping(BASE_PATH), webEndpoints, + endpointMediaTypes, getCorsConfiguration(), securityInterceptor, allEndpoints); } private CloudFoundrySecurityInterceptor getSecurityInterceptor(RestTemplateBuilder restTemplateBuilder, @@ -189,9 +188,7 @@ public class CloudFoundryActuatorAutoConfiguration { .forEach((path) -> requestMatchers.add(new AntPathRequestMatcher(path + "/**"))); requestMatchers.add(new AntPathRequestMatcher(BASE_PATH)); requestMatchers.add(new AntPathRequestMatcher(BASE_PATH + "/")); - if (!CollectionUtils.isEmpty(requestMatchers)) { - web.ignoring().requestMatchers(new OrRequestMatcher(requestMatchers)); - } + web.ignoring().requestMatchers(new OrRequestMatcher(requestMatchers)); } }