From 4db12806d1d2fff9cd2d5cecb53ed5cf5eb39978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?=
 <sdeleuze@users.noreply.github.com>
Date: Tue, 1 Apr 2025 16:49:19 +0200
Subject: [PATCH] Revert "Add a requiredExchange extension to RestClient"

This reverts commit dcb9383ba1239aa949983f5ef9e6dcf9cad4e98a.

See gh-34692
---
 .../web/client/RestClientExtensions.kt        | 16 ++-----------
 .../web/client/RestClientExtensionsTests.kt   | 23 +------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/spring-web/src/main/kotlin/org/springframework/web/client/RestClientExtensions.kt b/spring-web/src/main/kotlin/org/springframework/web/client/RestClientExtensions.kt
index 5159993951a..12092af8dfe 100644
--- a/spring-web/src/main/kotlin/org/springframework/web/client/RestClientExtensions.kt
+++ b/spring-web/src/main/kotlin/org/springframework/web/client/RestClientExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-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.
@@ -18,8 +18,6 @@ package org.springframework.web.client
 
 import org.springframework.core.ParameterizedTypeReference
 import org.springframework.http.ResponseEntity
-import org.springframework.web.client.RestClient.RequestHeadersSpec
-import org.springframework.web.client.RestClient.RequestHeadersSpec.ExchangeFunction
 
 /**
  * Extension for [RestClient.RequestBodySpec.body] providing a `bodyWithType<Foo>(...)` variant
@@ -53,15 +51,6 @@ inline fun <reified T : Any> RestClient.ResponseSpec.body(): T? =
 inline fun <reified T : Any> RestClient.ResponseSpec.requiredBody(): T =
     body(object : ParameterizedTypeReference<T>() {}) ?: throw NoSuchElementException("Response body is required")
 
-/**
- * Extension for [RestClient.RequestHeadersSpec.exchange] providing a `requiredExchange(...)` variant with a
- * non-nullable return value.
- * @throws NoSuchElementException if there is no response value
- * @since 6.2.6
- */
-fun <T: Any> RequestHeadersSpec<*>.requiredExchange(exchangeFunction: ExchangeFunction<T>, close: Boolean = true): T =
-	exchange(exchangeFunction, close) ?: throw NoSuchElementException("Response value is required")
-
 /**
  * Extension for [RestClient.ResponseSpec.toEntity] providing a `toEntity<Foo>()` variant
  * leveraging Kotlin reified type parameters. This extension is not subject to type
@@ -71,5 +60,4 @@ fun <T: Any> RequestHeadersSpec<*>.requiredExchange(exchangeFunction: ExchangeFu
  * @since 6.1
  */
 inline fun <reified T : Any> RestClient.ResponseSpec.toEntity(): ResponseEntity<T> =
-	toEntity(object : ParameterizedTypeReference<T>() {})
-
+	toEntity(object : ParameterizedTypeReference<T>() {})
\ No newline at end of file
diff --git a/spring-web/src/test/kotlin/org/springframework/web/client/RestClientExtensionsTests.kt b/spring-web/src/test/kotlin/org/springframework/web/client/RestClientExtensionsTests.kt
index 703398e2c4a..6e915901664 100644
--- a/spring-web/src/test/kotlin/org/springframework/web/client/RestClientExtensionsTests.kt
+++ b/spring-web/src/test/kotlin/org/springframework/web/client/RestClientExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-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.
@@ -19,12 +19,9 @@ package org.springframework.web.client
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.springframework.core.ParameterizedTypeReference
-import org.springframework.http.HttpRequest
-import org.springframework.web.client.RestClient.RequestHeadersSpec
 
 /**
  * Mock object based tests for [RestClient] Kotlin extensions
@@ -62,24 +59,6 @@ class RestClientExtensionsTests {
 		assertThrows<NoSuchElementException> { responseSpec.requiredBody<Foo>() }
 	}
 
-	@Test
-	fun `RequestHeadersSpec#requiredExchange`() {
-		val foo = Foo()
-		every { requestBodySpec.exchange(any<RequestHeadersSpec.ExchangeFunction<Foo>>(), any()) } returns foo
-		val exchangeFunction: (HttpRequest, RequestHeadersSpec.ConvertibleClientHttpResponse) -> Foo? =
-			{ _, _ -> foo }
-		val value = requestBodySpec.requiredExchange(exchangeFunction)
-		assertThat(value).isEqualTo(foo)
-	}
-
-	@Test
-	fun `RequestHeadersSpec#requiredExchange with null response throws NoSuchElementException`() {
-		every { requestBodySpec.exchange(any<RequestHeadersSpec.ExchangeFunction<Foo>>(), any()) } returns null
-		val exchangeFunction: (HttpRequest, RequestHeadersSpec.ConvertibleClientHttpResponse) -> Foo? =
-			{ _, _ -> null }
-		assertThrows<NoSuchElementException> { requestBodySpec.requiredExchange(exchangeFunction) }
-	}
-
 	@Test
 	fun `ResponseSpec#toEntity with reified type parameters`() {
 		responseSpec.toEntity<List<Foo>>()