From 8f668610f70200d71d46f3999528d9dbe6a88148 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 29 Jun 2019 21:09:54 +0100 Subject: [PATCH] Align RSocket auto-configuration latest Framework changes Closes gh-17366 --- .../rsocket/RSocketStrategiesAutoConfiguration.java | 2 +- .../rsocket/RSocketMessagingAutoConfigurationTests.java | 4 ++-- .../rsocket/RSocketServerAutoConfigurationTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java index ef4dfadc63..7db6ddd28f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java @@ -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(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java index bfb22af520..195550cd54 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfigurationTests.java @@ -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; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java index 5ba0849f0a..38f756ac56 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java @@ -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; }