Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align RSocket auto-configuration latest Framework changes

Browse Source 
Closes gh-17366
This commit is contained in:
Andy Wilkinson
2019-06-29 21:09:54 +01:00
parent 1fa48882bb
commit 8f668610f7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java
View File

@@ -61,7 +61,7 @@ public class RSocketStrategiesAutoConfiguration {
RSocketStrategies.Builder builder = RSocketStrategies.builder();
builder.reactiveAdapterStrategy(ReactiveAdapterRegistry.getSharedInstance());
customizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
builder.decoder(StringDecoder.textPlainOnly());
builder.decoder(StringDecoder.allMimeTypes());
builder.encoder(CharSequenceEncoder.allMimeTypes());
builder.dataBufferFactory(new NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT));
return builder.build();

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java
View File

@@ -72,7 +72,7 @@ class RSocketMessagingAutoConfigurationTests {
@Bean
public RSocketStrategies rSocketStrategies() {
return RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly())
.decoder(StringDecoder.textPlainOnly()).build();
.decoder(StringDecoder.allMimeTypes()).build();
}
}
@@ -84,7 +84,7 @@ class RSocketMessagingAutoConfigurationTests {
public RSocketMessageHandler customMessageHandler() {
RSocketMessageHandler messageHandler = new RSocketMessageHandler();
RSocketStrategies strategies = RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly())
.decoder(StringDecoder.textPlainOnly()).build();
.decoder(StringDecoder.allMimeTypes()).build();
messageHandler.setRSocketStrategies(strategies);
return messageHandler;
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
View File

@@ -101,7 +101,7 @@ class RSocketServerAutoConfigurationTests {
public RSocketMessageHandler messageHandler() {
RSocketMessageHandler messageHandler = new RSocketMessageHandler();
messageHandler.setRSocketStrategies(RSocketStrategies.builder().encoder(CharSequenceEncoder.textPlainOnly())
.decoder(StringDecoder.textPlainOnly()).build());
.decoder(StringDecoder.allMimeTypes()).build());
return messageHandler;
}