18
18
19
19
import java .net .URI ;
20
20
import java .util .Map ;
21
- import java .util .function .Consumer ;
22
21
23
22
import org .junit .jupiter .api .Test ;
24
23
25
24
import org .springframework .http .server .reactive .ServerHttpRequest ;
26
25
import org .springframework .test .web .reactive .server .WebTestClient ;
27
26
import org .springframework .web .bind .annotation .GetMapping ;
28
27
import org .springframework .web .bind .annotation .RestController ;
29
- import org .springframework .web .client .DefaultApiVersionInserter ;
28
+ import org .springframework .web .client .ApiVersionInserter ;
30
29
31
30
import static org .assertj .core .api .Assertions .assertThat ;
32
31
@@ -42,30 +41,28 @@ public class ApiVersionTests {
42
41
43
42
@ Test
44
43
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 ( ));
46
45
assertThat (result .get (HEADER_NAME )).isEqualTo ("1.2" );
47
46
}
48
47
49
48
@ Test
50
49
void queryParam () {
51
- Map <String , String > result = performRequest (builder -> builder .fromQueryParam ("api-version" ));
50
+ Map <String , String > result = performRequest (ApiVersionInserter .fromQueryParam ("api-version" ). build ( ));
52
51
assertThat (result .get ("query" )).isEqualTo ("api-version=1.2" );
53
52
}
54
53
55
54
@ Test
56
55
void pathSegment () {
57
- Map <String , String > result = performRequest (builder -> builder .fromPathSegment (0 ));
56
+ Map <String , String > result = performRequest (ApiVersionInserter .fromPathSegment (0 ). build ( ));
58
57
assertThat (result .get ("path" )).isEqualTo ("/1.2/path" );
59
58
}
60
59
61
60
@ 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 ) {
65
62
return WebTestClient .bindToController (new TestController ())
66
63
.configureClient ()
67
64
.baseUrl ("/path" )
68
- .apiVersionInserter (builder . build () )
65
+ .apiVersionInserter (inserter )
69
66
.build ()
70
67
.get ()
71
68
.apiVersion (1.2 )
0 commit comments