Skip to content

Commit adffd3d

Browse files
committed
Fix JsonConverterDelegate initialization in RestTestClient
If the RestClient was built with default message converters, then in mutate, the saved builder also has 0 converters, and adding a interferes with default registrations. We need to check if there are no converters at all, and if so use the default registrations. See gh-35793
1 parent 284a286 commit adffd3d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,10 @@ private static class ConverterCallback {
144144
client.mutate()
145145
.configureMessageConverters(convertersBuilder -> {
146146
HttpMessageConverters converters = convertersBuilder.build();
147-
if (converters.iterator().hasNext()) {
148-
this.converter = JsonConverterDelegate.of(converters);
147+
if (converters.isEmpty()) {
148+
converters = HttpMessageConverters.forClient().registerDefaults().build();
149149
}
150+
this.converter = JsonConverterDelegate.of(converters);
150151
})
151152
.build();
152153
}

0 commit comments

Comments
 (0)