Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@ private void checkConverterSupports(HttpMessageConverter<?> converter, MediaType
throw new IllegalArgumentException("converter should support '" + mediaType + "'");
}

void addCustomMessageConverter(int index, HttpMessageConverter<?> customConverter) {
Assert.notNull(customConverter, "'customConverter' must not be null");
this.customConverters.add(index, customConverter);
}

void addCustomMessageConverter(HttpMessageConverter<?> customConverter) {
Assert.notNull(customConverter, "'customConverter' must not be null");
this.customConverters.add(customConverter);
Expand Down Expand Up @@ -436,6 +441,12 @@ public ClientBuilder addCustomConverter(HttpMessageConverter<?> customConverter)
return this;
}

@Override
public ClientBuilder addCustomConverter(int index, HttpMessageConverter<?> customConverter) {
addCustomMessageConverter(index, customConverter);
return this;
}

@Override
public ClientBuilder configureMessageConverters(Consumer<HttpMessageConverter<?>> configurer) {
addMessageConverterConfigurer(configurer);
Expand Down Expand Up @@ -533,6 +544,12 @@ public ServerBuilder addCustomConverter(HttpMessageConverter<?> customConverter)
return this;
}

@Override
public ServerBuilder addCustomConverter(int index, HttpMessageConverter<?> customConverter) {
addCustomMessageConverter(index, customConverter);
return this;
}

@Override
public ServerBuilder configureMessageConverters(Consumer<HttpMessageConverter<?>> configurer) {
addMessageConverterConfigurer(configurer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,14 @@ interface Builder<T extends Builder<T>> {
*/
T addCustomConverter(HttpMessageConverter<?> customConverter);


/**
* Add a custom {@code HttpMessageConverter} to the list of converters, at the specified index, pushing all existing message converters forward one.
* @param customConverter the converter instance to add
* @param index index at which the specified element is to be inserted
*/
T addCustomConverter(int index, HttpMessageConverter<?> customConverter);

/**
* Add a consumer for configuring the selected message converters.
* @param configurer the configurer to use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,22 @@ void registerCustomMessageConverter() {
assertThat(converters).hasExactlyElementsOfTypes(CustomHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class);
}

@Test
void registerCustomMessageConverterAtIndex() {
var clientBuilder = HttpMessageConverters.forClient()
.addCustomConverter(0, new CustomHttpMessageConverter());
var converters = clientBuilder.build();

assertThat(converters).hasExactlyElementsOfTypes(CustomHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class);

clientBuilder.addCustomConverter(0, new CustomHttpMessageConverter());
converters = clientBuilder.build();

assertThat(converters).hasExactlyElementsOfTypes(
CustomHttpMessageConverter.class, CustomHttpMessageConverter.class,
AllEncompassingFormHttpMessageConverter.class);
}

@Test
void registerCustomMessageConverterAheadOfDefaults() {
var converters = HttpMessageConverters.forClient().registerDefaults()
Expand Down