Skip to content

Commit a52aa1d

Browse files
committed
#867 - Reenable default encoders and encoders.
Thanks to spring-projects/spring-framework#22612, Spring HATEAOAS no longer has to disable the default registry of encoders and decoders to get its custom components to work. Related issues: #885
1 parent 0e02d4f commit a52aa1d

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
package org.springframework.hateoas.config;
22

3+
import com.fasterxml.jackson.databind.ObjectMapper;
34
import lombok.RequiredArgsConstructor;
4-
5-
import java.util.ArrayList;
6-
import java.util.Collection;
7-
import java.util.List;
8-
95
import org.springframework.context.annotation.Configuration;
10-
import org.springframework.core.codec.CharSequenceEncoder;
116
import org.springframework.core.codec.Decoder;
127
import org.springframework.core.codec.Encoder;
13-
import org.springframework.core.codec.StringDecoder;
148
import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
159
import org.springframework.http.codec.json.Jackson2JsonDecoder;
1610
import org.springframework.http.codec.json.Jackson2JsonEncoder;
1711
import org.springframework.util.MimeType;
1812
import org.springframework.web.reactive.function.client.ExchangeStrategies;
1913
import org.springframework.web.reactive.function.client.WebClient;
2014

21-
import com.fasterxml.jackson.databind.ObjectMapper;
15+
import java.util.ArrayList;
16+
import java.util.Collection;
17+
import java.util.List;
2218

2319
/**
2420
* Assembles {@link ExchangeStrategies} needed to wire a {@link WebClient} with hypermedia support.
@@ -52,15 +48,11 @@ public ExchangeStrategies hypermediaExchangeStrategies() {
5248
decoders.add(new Jackson2JsonDecoder(objectMapper, mimeTypes));
5349
});
5450

55-
encoders.add(CharSequenceEncoder.allMimeTypes());
56-
decoders.add(StringDecoder.allMimeTypes());
57-
5851
return ExchangeStrategies.builder().codecs(clientCodecConfigurer -> {
5952

6053
encoders.forEach(encoder -> clientCodecConfigurer.customCodecs().encoder(encoder));
6154
decoders.forEach(decoder -> clientCodecConfigurer.customCodecs().decoder(decoder));
6255

63-
clientCodecConfigurer.registerDefaults(false);
6456
}).build();
6557
}
6658

0 commit comments

Comments
 (0)