root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Configure String codecs in RSocket strategies 

Closes gh-16924
This commit is contained in:
Brian Clozel 2019-05-27 15:19:27 +02:00
parent b2e395db7a
commit 45507c475b
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.core.annotation.Order;
import org.springframework.core.codec.CharSequenceEncoder;
import org.springframework.core.codec.StringDecoder;
import org.springframework.core.io.buffer.NettyDataBufferFactory;
import org.springframework.http.MediaType;
import org.springframework.http.codec.cbor.Jackson2CborDecoder;
@ -62,6 +64,8 @@ public class RSocketStrategiesAutoConfiguration {
builder.reactiveAdapterStrategy(ReactiveAdapterRegistry.getSharedInstance());
customizers.orderedStream()
.forEach((customizer) -> customizer.customize(builder));
builder.decoder(StringDecoder.textPlainOnly());
builder.encoder(CharSequenceEncoder.textPlainOnly());
builder.dataBufferFactory(
new NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT));
return builder.build();

21
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfigurationTests.java
View File

@ -24,6 +24,8 @@ import org.springframework.boot.rsocket.messaging.RSocketStrategiesCustomizer;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.codec.ByteArrayDecoder;
import org.springframework.core.codec.ByteArrayEncoder;
import org.springframework.core.codec.CharSequenceEncoder;
import org.springframework.core.codec.StringDecoder;
import org.springframework.http.codec.cbor.Jackson2CborDecoder;
@ -51,16 +53,19 @@ public class RSocketStrategiesAutoConfigurationTests {
this.contextRunner.run((context) -> {
assertThat(context).getBeans(RSocketStrategies.class).hasSize(1);
RSocketStrategies strategies = context.getBean(RSocketStrategies.class);
assertThat(strategies.decoders()).hasSize(2);
assertThat(strategies.decoders()).hasSize(3);
assertThat(strategies.decoders().get(0))
.isInstanceOf(Jackson2CborDecoder.class);
assertThat(strategies.decoders().get(1))
.isInstanceOf(Jackson2JsonDecoder.class);
assertThat(strategies.encoders()).hasSize(2);
assertThat(strategies.decoders().get(2)).isInstanceOf(StringDecoder.class);
assertThat(strategies.encoders()).hasSize(3);
assertThat(strategies.encoders().get(0))
.isInstanceOf(Jackson2CborEncoder.class);
assertThat(strategies.encoders().get(1))
.isInstanceOf(Jackson2JsonEncoder.class);
assertThat(strategies.encoders().get(2))
.isInstanceOf(CharSequenceEncoder.class);
});
}
@ -80,10 +85,10 @@ public class RSocketStrategiesAutoConfigurationTests {
assertThat(context).getBeans(RSocketStrategies.class).hasSize(1);
RSocketStrategies strategies = context
.getBean(RSocketStrategies.class);
assertThat(strategies.decoders()).hasSize(3)
.hasAtLeastOneElementOfType(StringDecoder.class);
assertThat(strategies.encoders()).hasSize(3)
.hasAtLeastOneElementOfType(CharSequenceEncoder.class);
assertThat(strategies.decoders()).hasSize(4)
.hasAtLeastOneElementOfType(ByteArrayDecoder.class);
assertThat(strategies.encoders()).hasSize(4)
.hasAtLeastOneElementOfType(ByteArrayEncoder.class);
});
}
@ -119,8 +124,8 @@ public class RSocketStrategiesAutoConfigurationTests {
@Bean
public RSocketStrategiesCustomizer myCustomizer() {
return (strategies) -> strategies.encoder(CharSequenceEncoder.textPlainOnly())
.decoder(StringDecoder.textPlainOnly());
return (strategies) -> strategies.encoder(new ByteArrayEncoder())
.decoder(new ByteArrayDecoder());
}
}