mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
Replace X-API-Version with API-Version
Closes gh-35494
This commit is contained in:
@@ -64,8 +64,8 @@ public class RestClientVersionTests {
|
||||
|
||||
@Test
|
||||
void header() {
|
||||
performRequest(ApiVersionInserter.useHeader("X-API-Version"));
|
||||
expectRequest(request -> assertThat(request.getHeaders().get("X-API-Version")).isEqualTo("1.2"));
|
||||
performRequest(ApiVersionInserter.useHeader("API-Version"));
|
||||
expectRequest(request -> assertThat(request.getHeaders().get("API-Version")).isEqualTo("1.2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -101,11 +101,11 @@ public class RestClientVersionTests {
|
||||
|
||||
@Test
|
||||
void defaultVersion() {
|
||||
ApiVersionInserter inserter = ApiVersionInserter.useHeader("X-API-Version");
|
||||
ApiVersionInserter inserter = ApiVersionInserter.useHeader("API-Version");
|
||||
RestClient restClient = restClientBuilder.defaultApiVersion(1.2).apiVersionInserter(inserter).build();
|
||||
restClient.get().uri("/path").retrieve().body(String.class);
|
||||
|
||||
expectRequest(request -> assertThat(request.getHeaders().get("X-API-Version")).isEqualTo("1.2"));
|
||||
expectRequest(request -> assertThat(request.getHeaders().get("API-Version")).isEqualTo("1.2"));
|
||||
}
|
||||
|
||||
private void performRequest(ApiVersionInserter versionInserter) {
|
||||
|
||||
+2
-2
@@ -187,7 +187,7 @@ class RestClientAdapterTests {
|
||||
|
||||
RestClient restClient = RestClient.builder()
|
||||
.baseUrl(anotherServer.url("/").toString())
|
||||
.apiVersionInserter(ApiVersionInserter.useHeader("X-API-Version"))
|
||||
.apiVersionInserter(ApiVersionInserter.useHeader("API-Version"))
|
||||
.build();
|
||||
|
||||
RestClientAdapter adapter = RestClientAdapter.create(restClient);
|
||||
@@ -196,7 +196,7 @@ class RestClientAdapterTests {
|
||||
String actualResponse = service.getGreetingWithVersion();
|
||||
|
||||
RecordedRequest request = anotherServer.takeRequest();
|
||||
assertThat(request.getHeaders().get("X-API-Version")).isEqualTo("1.2");
|
||||
assertThat(request.getHeaders().get("API-Version")).isEqualTo("1.2");
|
||||
assertThat(actualResponse).isEqualTo("Hello Spring 2!");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user