Skip to content

Commit 511a430

Browse files
committed
Polish
1 parent 1b93ea9 commit 511a430

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ protected List<? extends HandlerMethodArgumentResolver> initArgumentResolvers()
201201

202202
// Catch-all
203203
resolvers.add(new PayloadMethodArgumentResolver(
204-
this.decoders, this.validator, getReactiveAdapterRegistry(), true));
204+
getDecoders(), this.validator, getReactiveAdapterRegistry(), true));
205205

206206
return resolvers;
207207
}

spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import io.rsocket.SocketAcceptor;
2727
import reactor.core.publisher.Mono;
2828

29+
import org.springframework.core.ReactiveAdapterRegistry;
2930
import org.springframework.core.codec.Decoder;
3031
import org.springframework.core.codec.Encoder;
3132
import org.springframework.lang.Nullable;
@@ -69,8 +70,26 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
6970
private MimeType defaultMetadataMimeType = MessagingRSocket.COMPOSITE_METADATA;
7071

7172

73+
/**
74+
* {@inheritDoc}
75+
* <p>If {@link #setRSocketStrategies(RSocketStrategies) rsocketStrategies}
76+
* is also set, this property is re-initialized with the decoders in it.
77+
* Or vice versa, if {@link #setRSocketStrategies(RSocketStrategies)
78+
* rsocketStrategies} is not set, it will be initialized from this and
79+
* other properties.
80+
*/
81+
@Override
82+
public void setDecoders(List<? extends Decoder<?>> decoders) {
83+
super.setDecoders(decoders);
84+
}
85+
7286
/**
7387
* Configure the encoders to use for encoding handler method return values.
88+
* <p>If {@link #setRSocketStrategies(RSocketStrategies) rsocketStrategies}
89+
* is also set, this property is re-initialized with the encoders in it.
90+
* Or vice versa, if {@link #setRSocketStrategies(RSocketStrategies)
91+
* rsocketStrategies} is not set, it will be initialized from this and
92+
* other properties.
7493
*/
7594
public void setEncoders(List<? extends Encoder<?>> encoders) {
7695
this.encoders.addAll(encoders);
@@ -84,12 +103,12 @@ public List<? extends Encoder<?>> getEncoders() {
84103
}
85104

86105
/**
87-
* Provide configuration in the form of {@link RSocketStrategies}. This is
88-
* an alternative to using {@link #setEncoders(List)},
89-
* {@link #setDecoders(List)}, and others directly. It is convenient when
90-
* you also configuring an {@link RSocketRequester} in which case the
91-
* {@link RSocketStrategies} encapsulates required configuration for re-use.
92-
* @param rsocketStrategies the strategies to use
106+
* Provide configuration in the form of {@link RSocketStrategies} instance
107+
* which can also be re-used to initialize a client-side
108+
* {@link RSocketRequester}. When this property is set, it also sets
109+
* {@link #setDecoders(List) decoders}, {@link #setEncoders(List) encoders},
110+
* and {@link #setReactiveAdapterRegistry(ReactiveAdapterRegistry)
111+
* reactiveAdapterRegistry}.
93112
*/
94113
public void setRSocketStrategies(@Nullable RSocketStrategies rsocketStrategies) {
95114
this.rsocketStrategies = rsocketStrategies;
@@ -100,6 +119,10 @@ public void setRSocketStrategies(@Nullable RSocketStrategies rsocketStrategies)
100119
}
101120
}
102121

122+
/**
123+
* Return the configured {@link RSocketStrategies}. This may be {@code null}
124+
* before {@link #afterPropertiesSet()} is called.
125+
*/
103126
@Nullable
104127
public RSocketStrategies getRSocketStrategies() {
105128
return this.rsocketStrategies;

0 commit comments

Comments
 (0)