spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity

Add null check when setting API version to preserve default value

Browse Source 
See gh-36514

Signed-off-by: Vishnutheep B <vishnutheep@gmail.com>
This commit is contained in:
Vishnutheep B
2026-03-31 11:00:22 +01:00
committed by rstoyanchev
parent ebe3b45743
commit 00be6d3afd
4 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/client/support/RestClientAdapterTests.java
+21
View File
@@ -200,6 +200,27 @@ class RestClientAdapterTests {
assertThat(actualResponse).isEqualTo("Hello Spring 2!");
}
@Test
void greetingWithDefaultApiVersion() throws Exception {
prepareResponse(builder ->
builder.setHeader("Content-Type", "text/plain").body("Hello Spring 2!"));
RestClient restClient = RestClient.builder()
.baseUrl(anotherServer.url("/").toString())
.defaultApiVersion("1.0")
.apiVersionInserter(ApiVersionInserter.useHeader("X-Version"))
.build();
RestClientAdapter adapter = RestClientAdapter.create(restClient);
Service service = HttpServiceProxyFactory.builderFor(adapter).build().createClient(Service.class);
String actualResponse = service.getGreeting();
RecordedRequest request = anotherServer.takeRequest();
assertThat(request.getHeaders().get("X-Version")).isEqualTo("1.0");
assertThat(actualResponse).isEqualTo("Hello Spring 2!");
}
@Test // see gh-36326
void getBodyWithGenericReturnType() {
prepareResponse(r -> r.setHeader("Content-Type", "application/json").body("{\"name\":\"Karl\"}"));