Skip to content

Commit d8b506e

Browse files
committed
Fix failing test
1 parent e5d4d7c commit d8b506e

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ApiVersionTests.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818

1919
import java.net.URI;
2020
import java.util.Map;
21-
import java.util.function.Consumer;
2221

2322
import org.junit.jupiter.api.Test;
2423

2524
import org.springframework.http.server.reactive.ServerHttpRequest;
2625
import org.springframework.test.web.reactive.server.WebTestClient;
2726
import org.springframework.web.bind.annotation.GetMapping;
2827
import org.springframework.web.bind.annotation.RestController;
29-
import org.springframework.web.client.DefaultApiVersionInserter;
28+
import org.springframework.web.client.ApiVersionInserter;
3029

3130
import static org.assertj.core.api.Assertions.assertThat;
3231

@@ -42,30 +41,28 @@ public class ApiVersionTests {
4241

4342
@Test
4443
void header() {
45-
Map<String, String> result = performRequest(builder -> builder.fromHeader("X-API-Version"));
44+
Map<String, String> result = performRequest(ApiVersionInserter.fromHeader("X-API-Version").build());
4645
assertThat(result.get(HEADER_NAME)).isEqualTo("1.2");
4746
}
4847

4948
@Test
5049
void queryParam() {
51-
Map<String, String> result = performRequest(builder -> builder.fromQueryParam("api-version"));
50+
Map<String, String> result = performRequest(ApiVersionInserter.fromQueryParam("api-version").build());
5251
assertThat(result.get("query")).isEqualTo("api-version=1.2");
5352
}
5453

5554
@Test
5655
void pathSegment() {
57-
Map<String, String> result = performRequest(builder -> builder.fromPathSegment(0));
56+
Map<String, String> result = performRequest(ApiVersionInserter.fromPathSegment(0).build());
5857
assertThat(result.get("path")).isEqualTo("/1.2/path");
5958
}
6059

6160
@SuppressWarnings("unchecked")
62-
private Map<String, String> performRequest(Consumer<DefaultApiVersionInserter.Builder> consumer) {
63-
DefaultApiVersionInserter.Builder builder = DefaultApiVersionInserter.builder();
64-
consumer.accept(builder);
61+
private Map<String, String> performRequest(ApiVersionInserter inserter) {
6562
return WebTestClient.bindToController(new TestController())
6663
.configureClient()
6764
.baseUrl("/path")
68-
.apiVersionInserter(builder.build())
65+
.apiVersionInserter(inserter)
6966
.build()
7067
.get()
7168
.apiVersion(1.2)

0 commit comments

Comments
 (0)