Merge branch '3.2.x' into 3.3.x

Closes gh-41949
spring-projects · Aug 20, 2024 · d62a5ac · d62a5ac
2 parents 1d337b7 + 1a2d1c5
commit d62a5ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/...docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyUserHandler.java b/...docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyUserHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,18 +24,15 @@
 public class MyUserHandler {
 
 	public ServerResponse getUser(ServerRequest request) {
-		/**/
-		return ServerResponse.ok().build();
+		/**/ return ServerResponse.ok().build();
 	}
 
 	public ServerResponse getUserCustomers(ServerRequest request) {
-		/**/
-		return ServerResponse.ok().build();
+		/**/ return ServerResponse.ok().build();
 	}
 
 	public ServerResponse deleteUser(ServerRequest request) {
-		/**/
-		return ServerResponse.ok().build();
+		/**/ return ServerResponse.ok().build();
 	}
 
 }
diff --git a/...-docs/src/main/kotlin/org/springframework/boot/docs/web/reactive/webflux/MyUserHandler.kt b/...-docs/src/main/kotlin/org/springframework/boot/docs/web/reactive/webflux/MyUserHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,15 +26,15 @@ import reactor.core.publisher.Mono
 class MyUserHandler {
 
 	fun getUser(request: ServerRequest?): Mono<ServerResponse> {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 	fun getUserCustomers(request: ServerRequest?): Mono<ServerResponse> {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 	fun deleteUser(request: ServerRequest?): Mono<ServerResponse> {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 }
diff --git a/...docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/MyUserHandler.kt b/...docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/MyUserHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,15 +25,15 @@ import org.springframework.web.servlet.function.ServerResponse
 class MyUserHandler {
 
 	fun getUser(request: ServerRequest?): ServerResponse {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 	fun getUserCustomers(request: ServerRequest?): ServerResponse {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 	fun deleteUser(request: ServerRequest?): ServerResponse {
-		return ServerResponse.ok().build()
+		/**/ return ServerResponse.ok().build()
 	}
 
 }