Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 833e3aec27d0 · 2022-05-06T18:15:20.000+01:00
Closes gh-30887
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
@@ -408,6 +408,11 @@ Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange,
 			return this.operation.handle(exchange, body);
 		}
 
+		@Override
+		public String toString() {
+			return this.operation.toString();
+		}
+
 	}
 
 	/**
@@ -426,6 +431,11 @@ Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange) {
 			return this.operation.handle(exchange, null);
 		}
 
+		@Override
+		public String toString() {
+			return this.operation.toString();
+		}
+
 	}
 
 	private static class WebFluxEndpointHandlerMethod extends HandlerMethod {

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,11 @@ Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange,`
`408`	`408`	`return this.operation.handle(exchange, body);`
`409`	`409`	`}`
`410`	`410`
	`411`	`+ @Override`
	`412`	`+ public String toString() {`
	`413`	`+ return this.operation.toString();`
	`414`	`+ }`
	`415`	`+`
`411`	`416`	`}`
`412`	`417`
`413`	`418`	`/**`
`@@ -426,6 +431,11 @@ Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange) {`
`426`	`431`	`return this.operation.handle(exchange, null);`
`427`	`432`	`}`
`428`	`433`
	`434`	`+ @Override`
	`435`	`+ public String toString() {`
	`436`	`+ return this.operation.toString();`
	`437`	`+ }`
	`438`	`+`
`429`	`439`	`}`
`430`	`440`
`431`	`441`	`private static class WebFluxEndpointHandlerMethod extends HandlerMethod {`