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

Support @RSocketExchange for annotated responders

Browse Source 
See gh-30936
This commit is contained in:
Olga MaciaszekSharma
2023-07-27 17:24:40 +02:00
committed by rstoyanchev
parent 376223c87d
commit 4cd9e2e9b0
3 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ import org.springframework.messaging.rsocket.MetadataExtractor;
import org.springframework.messaging.rsocket.RSocketRequester;
import org.springframework.messaging.rsocket.RSocketStrategies;
import org.springframework.messaging.rsocket.annotation.ConnectMapping;
import org.springframework.messaging.rsocket.service.RSocketExchange;
import org.springframework.util.Assert;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
@@ -60,8 +61,9 @@ import org.springframework.util.StringUtils;
/**
* Extension of {@link MessageMappingMessageHandler} for handling RSocket
* requests with {@link ConnectMapping @ConnectMapping} and
* {@link MessageMapping @MessageMapping} methods.
* requests with {@link ConnectMapping @ConnectMapping},
* {@link MessageMapping @MessageMapping}
* and {@link RSocketExchange @RSocketExchange} methods.
*
* <p>For server scenarios this class can be declared as a bean in Spring
* configuration and that would detect {@code @MessageMapping} methods in
@@ -77,13 +79,14 @@ import org.springframework.util.StringUtils;
* {@link org.springframework.messaging.rsocket.RSocketRequester.Builder#rsocketConnector
* RSocketRequester.Builder}.
*
* <p>For {@code @MessageMapping} methods, this class automatically determines
* the RSocket interaction type based on the input and output cardinality of the
* method. See the
* <p>For {@code @MessageMapping} and {@code @RSocketExchange} methods,
* this class automatically determines the RSocket interaction type
* based on the input and output cardinality of the method. See the
* <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/web-reactive.html#rsocket-annot-responders">
* "Annotated Responders"</a> section of the Spring Framework reference for more details.
*
* @author Rossen Stoyanchev
* @author Olga Maciaszek-Sharma
* @since 5.2
*/
public class RSocketMessageHandler extends MessageMappingMessageHandler {
@@ -322,6 +325,15 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
RSocketFrameTypeMessageCondition.CONNECT_CONDITION,
new DestinationPatternsMessageCondition(patterns, obtainRouteMatcher()));
}
RSocketExchange ann3 = AnnotatedElementUtils.findMergedAnnotation(element, RSocketExchange.class);
if (ann3 != null && StringUtils.hasText(ann3.value())) {
String[] destinations = new String[]{ann3.value()};
return new CompositeMessageCondition(
RSocketFrameTypeMessageCondition.EMPTY_CONDITION,
new DestinationPatternsMessageCondition(processDestinations(destinations),
obtainRouteMatcher())
);
}
return null;
}
@@ -402,7 +414,8 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
* connection. Such a method can also start requests to the client but that
* must be done decoupled from handling and from the current thread.
* <p>Subsequent requests on the connection can be handled with
* {@link MessageMapping MessageMapping} methods.
* {@link MessageMapping MessageMapping}
* and {@link RSocketExchange RSocketExchange} methods.
*/
public SocketAcceptor responder() {
return (setupPayload, sendingRSocket) -> {