Merge branch '3.5.x' into 4.0.x

bclozel · bclozel · commit 26edf7908480 · 2026-03-19T09:40:05.000+01:00
diff --git a/module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMapping.java b/module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMapping.java
@@ -555,6 +555,7 @@ private static final class CatchAllHandler {
 			this.responseStatus = responseStatus;
 		}
 
+		@Reflective
 		Mono<Void> handle(ServerWebExchange exchange) {
 			ServerHttpResponse response = exchange.getResponse();
 			response.setStatusCode(this.responseStatus);
@@ -623,7 +624,7 @@ static class AbstractWebFluxEndpointHandlerMappingRuntimeHints implements Runtim
 		@Override
 		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 			this.reflectiveRegistrar.registerRuntimeHints(hints, WriteOperationHandler.class,
-					ReadOperationHandler.class);
+					ReadOperationHandler.class, CatchAllHandler.class);
 		}
 
 	}
diff --git a/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMappingTests.java b/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/actuate/endpoint/web/AbstractWebFluxEndpointHandlerMappingTests.java
@@ -45,6 +45,10 @@ void shouldRegisterHints() {
 			.onType(TypeReference
 				.of("org.springframework.boot.webflux.actuate.endpoint.web.AbstractWebFluxEndpointHandlerMapping.ReadOperationHandler")))
 			.accepts(runtimeHints);
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(TypeReference
+				.of("org.springframework.boot.webflux.actuate.endpoint.web.AbstractWebFluxEndpointHandlerMapping.CatchAllHandler")))
+			.accepts(runtimeHints);
 	}
 
 }
diff --git a/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java b/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java
@@ -494,6 +494,7 @@ private static final class CatchAllHandler {
 			this.responseStatus = responseStatus;
 		}
 
+		@Reflective
 		void handle(HttpServletResponse response) {
 			response.setStatus(this.responseStatus.value());
 		}
@@ -559,7 +560,7 @@ static class AbstractWebMvcEndpointHandlerMappingRuntimeHints implements Runtime
 
 		@Override
 		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
-			this.reflectiveRegistrar.registerRuntimeHints(hints, OperationHandler.class);
+			this.reflectiveRegistrar.registerRuntimeHints(hints, OperationHandler.class, CatchAllHandler.class);
 		}
 
 	}
diff --git a/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMappingTests.java b/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMappingTests.java
@@ -40,6 +40,10 @@ void shouldRegisterHints() {
 			.onType(TypeReference
 				.of("org.springframework.boot.webmvc.actuate.endpoint.web.AbstractWebMvcEndpointHandlerMapping.OperationHandler")))
 			.accepts(runtimeHints);
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(TypeReference
+				.of("org.springframework.boot.webmvc.actuate.endpoint.web.AbstractWebMvcEndpointHandlerMapping.CatchAllHandler")))
+			.accepts(runtimeHints);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,7 @@ private static final class CatchAllHandler {`
`555`	`555`	`this.responseStatus = responseStatus;`
`556`	`556`	`}`
`557`	`557`
	`558`	`+ @Reflective`
`558`	`559`	`Mono<Void> handle(ServerWebExchange exchange) {`
`559`	`560`	`ServerHttpResponse response = exchange.getResponse();`
`560`	`561`	`response.setStatusCode(this.responseStatus);`
`@@ -623,7 +624,7 @@ static class AbstractWebFluxEndpointHandlerMappingRuntimeHints implements Runtim`
`623`	`624`	`@Override`
`624`	`625`	`public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {`
`625`	`626`	`this.reflectiveRegistrar.registerRuntimeHints(hints, WriteOperationHandler.class,`
`626`		`- ReadOperationHandler.class);`
	`627`	`+ ReadOperationHandler.class, CatchAllHandler.class);`
`627`	`628`	`}`
`628`	`629`
`629`	`630`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ void shouldRegisterHints() {`
`45`	`45`	`.onType(TypeReference`
`46`	`46`	`.of("org.springframework.boot.webflux.actuate.endpoint.web.AbstractWebFluxEndpointHandlerMapping.ReadOperationHandler")))`
`47`	`47`	`.accepts(runtimeHints);`
	`48`	`+ assertThat(RuntimeHintsPredicates.reflection()`
	`49`	`+ .onType(TypeReference`
	`50`	`+ .of("org.springframework.boot.webflux.actuate.endpoint.web.AbstractWebFluxEndpointHandlerMapping.CatchAllHandler")))`
	`51`	`+ .accepts(runtimeHints);`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ private static final class CatchAllHandler {`
`494`	`494`	`this.responseStatus = responseStatus;`
`495`	`495`	`}`
`496`	`496`
	`497`	`+ @Reflective`
`497`	`498`	`void handle(HttpServletResponse response) {`
`498`	`499`	`response.setStatus(this.responseStatus.value());`
`499`	`500`	`}`
`@@ -559,7 +560,7 @@ static class AbstractWebMvcEndpointHandlerMappingRuntimeHints implements Runtime`
`559`	`560`
`560`	`561`	`@Override`
`561`	`562`	`public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {`
`562`		`- this.reflectiveRegistrar.registerRuntimeHints(hints, OperationHandler.class);`
	`563`	`+ this.reflectiveRegistrar.registerRuntimeHints(hints, OperationHandler.class, CatchAllHandler.class);`
`563`	`564`	`}`
`564`	`565`
`565`	`566`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ void shouldRegisterHints() {`
`40`	`40`	`.onType(TypeReference`
`41`	`41`	`.of("org.springframework.boot.webmvc.actuate.endpoint.web.AbstractWebMvcEndpointHandlerMapping.OperationHandler")))`
`42`	`42`	`.accepts(runtimeHints);`
	`43`	`+ assertThat(RuntimeHintsPredicates.reflection()`
	`44`	`+ .onType(TypeReference`
	`45`	`+ .of("org.springframework.boot.webmvc.actuate.endpoint.web.AbstractWebMvcEndpointHandlerMapping.CatchAllHandler")))`
	`46`	`+ .accepts(runtimeHints);`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`}`