Skip to content

Commit 7ddd1e2

Browse files
committed
Merge pull request #29361 from sdeleuze
* pr/32822: Provide a workaround to allow multiple @ImportRuntimeHints Closes gh-29361
2 parents ea094dd + 4e131bd commit 7ddd1e2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointHandlerMapping.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
3232
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
3333
import org.springframework.boot.actuate.endpoint.web.Link;
34+
import org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping.AbstractWebFluxEndpointHandlerMappingRuntimeHints;
3435
import org.springframework.boot.actuate.endpoint.web.reactive.WebFluxEndpointHandlerMapping.WebFluxEndpointHandlerMappingRuntimeHints;
3536
import org.springframework.context.annotation.ImportRuntimeHints;
3637
import org.springframework.web.bind.annotation.ResponseBody;
@@ -48,7 +49,8 @@
4849
* @author Brian Clozel
4950
* @since 2.0.0
5051
*/
51-
@ImportRuntimeHints(WebFluxEndpointHandlerMappingRuntimeHints.class)
52+
@ImportRuntimeHints({ WebFluxEndpointHandlerMappingRuntimeHints.class,
53+
AbstractWebFluxEndpointHandlerMappingRuntimeHints.class })
5254
public class WebFluxEndpointHandlerMapping extends AbstractWebFluxEndpointHandlerMapping implements InitializingBean {
5355

5456
private final EndpointLinksResolver linksResolver;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/WebMvcEndpointHandlerMapping.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
3434
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
3535
import org.springframework.boot.actuate.endpoint.web.Link;
36+
import org.springframework.boot.actuate.endpoint.web.servlet.AbstractWebMvcEndpointHandlerMapping.AbstractWebMvcEndpointHandlerMappingRuntimeHints;
3637
import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping.WebMvcEndpointHandlerMappingRuntimeHints;
3738
import org.springframework.context.annotation.ImportRuntimeHints;
3839
import org.springframework.web.bind.annotation.ResponseBody;
@@ -47,7 +48,8 @@
4748
* @author Phillip Webb
4849
* @since 2.0.0
4950
*/
50-
@ImportRuntimeHints(WebMvcEndpointHandlerMappingRuntimeHints.class)
51+
@ImportRuntimeHints({ WebMvcEndpointHandlerMappingRuntimeHints.class,
52+
AbstractWebMvcEndpointHandlerMappingRuntimeHints.class })
5153
public class WebMvcEndpointHandlerMapping extends AbstractWebMvcEndpointHandlerMapping {
5254

5355
private final EndpointLinksResolver linksResolver;

0 commit comments

Comments
 (0)