Merge branch '2.6.x' into 2.7.x

Closes gh-30049

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/reactive/webflux/MyRestController.java

@@ -38,19 +38,19 @@ public class MyRestController {
 		this.customerRepository = customerRepository;
 	}
 
-	@GetMapping("/{user}")
+	@GetMapping("/{userId}")
 	public Mono<User> getUser(@PathVariable Long userId) {
 		return this.userRepository.findById(userId);
 	}
 
-	@GetMapping("/{user}/customers")
+	@GetMapping("/{userId}/customers")
 	public Flux<Customer> getUserCustomers(@PathVariable Long userId) {
 		return this.userRepository.findById(userId).flatMapMany(this.customerRepository::findByUser);
 	}
 
-	@DeleteMapping("/{user}")
-	public void deleteUser(@PathVariable Long userId) {
-		this.userRepository.deleteById(userId);
+	@DeleteMapping("/{userId}")
+	public Mono<Void> deleteUser(@PathVariable Long userId) {
+		return this.userRepository.deleteById(userId);
 	}
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/MyRestController.java

@@ -37,17 +37,17 @@ public class MyRestController {
 		this.customerRepository = customerRepository;
 	}
 
-	@GetMapping("/{user}")
+	@GetMapping("/{userId}")
 	public User getUser(@PathVariable Long userId) {
 		return this.userRepository.findById(userId).get();
 	}
 
-	@GetMapping("/{user}/customers")
+	@GetMapping("/{userId}/customers")
 	public List<Customer> getUserCustomers(@PathVariable Long userId) {
 		return this.userRepository.findById(userId).map(this.customerRepository::findByUser).get();
 	}
 
-	@DeleteMapping("/{user}")
+	@DeleteMapping("/{userId}")
 	public void deleteUser(@PathVariable Long userId) {
 		this.userRepository.deleteById(userId);
 	}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/reactive/webflux/MyRestController.kt

@@ -28,21 +28,21 @@ import reactor.core.publisher.Mono
 @RequestMapping("/users")
 class MyRestController(private val userRepository: UserRepository, private val customerRepository: CustomerRepository) {
 
-	@GetMapping("/{user}")
+	@GetMapping("/{userId}")
 	fun getUser(@PathVariable userId: Long): Mono<User?> {
 		return userRepository.findById(userId)
 	}
 
-	@GetMapping("/{user}/customers")
+	@GetMapping("/{userId}/customers")
 	fun getUserCustomers(@PathVariable userId: Long): Flux<Customer> {
 		return userRepository.findById(userId).flatMapMany { user: User? ->
 			customerRepository.findByUser(user)
 		}
 	}
 
-	@DeleteMapping("/{user}")
-	fun deleteUser(@PathVariable userId: Long) {
-		userRepository.deleteById(userId)
+	@DeleteMapping("/{userId}")
+	fun deleteUser(@PathVariable userId: Long): Mono<Void> {
+		return userRepository.deleteById(userId)
 	}
 
 }

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/MyRestController.kt

@@ -27,17 +27,17 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/users")
 class MyRestController(private val userRepository: UserRepository, private val customerRepository: CustomerRepository) {
 
-	@GetMapping("/{user}")
+	@GetMapping("/{userId}")
 	fun getUser(@PathVariable userId: Long): User {
 		return userRepository.findById(userId).get()
 	}
 
-	@GetMapping("/{user}/customers")
+	@GetMapping("/{userId}/customers")
 	fun getUserCustomers(@PathVariable userId: Long): List<Customer> {
 		return userRepository.findById(userId).map(customerRepository::findByUser).get()
 	}
 
-	@DeleteMapping("/{user}")
+	@DeleteMapping("/{userId}")
 	fun deleteUser(@PathVariable userId: Long) {
 		userRepository.deleteById(userId)
 	}