Replace create with wrap in RSocketRequester

Author: rstoyanchev

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java

@@ -87,7 +87,7 @@ public Mono<RSocketRequester> connect(ClientTransport transport) {
 			this.factoryConfigurers.forEach(configurer -> configurer.accept(factory));
 
 			return factory.transport(transport).start()
-					.map(rsocket -> RSocketRequester.create(rsocket, dataMimeType, strategies));
+					.map(rsocket -> new DefaultRSocketRequester(rsocket, dataMimeType, strategies));
 		});
 	}
 

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java

@@ -72,7 +72,10 @@ public RSocket apply(RSocket sendingRSocket) {
 	}
 
 	private MessagingRSocket createRSocket(RSocket rsocket) {
-		return new MessagingRSocket(this::handleMessage, rsocket, this.defaultDataMimeType, getRSocketStrategies());
+		return new MessagingRSocket(this::handleMessage,
+				RSocketRequester.wrap(rsocket, this.defaultDataMimeType, getRSocketStrategies()),
+				this.defaultDataMimeType,
+				getRSocketStrategies().dataBufferFactory());
 	}
 
 }

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java

@@ -61,18 +61,18 @@ class MessagingRSocket extends AbstractRSocket {
 	@Nullable
 	private MimeType dataMimeType;
 
-	private final RSocketStrategies strategies;
+	private final DataBufferFactory bufferFactory;
 
 
-	MessagingRSocket(Function<Message<?>, Mono<Void>> handler, RSocket sendingRSocket,
-			@Nullable MimeType defaultDataMimeType, RSocketStrategies strategies) {
+	MessagingRSocket(Function<Message<?>, Mono<Void>> handler, RSocketRequester requester,
+			@Nullable MimeType defaultDataMimeType, DataBufferFactory bufferFactory) {
 
 		Assert.notNull(handler, "'handler' is required");
-		Assert.notNull(sendingRSocket, "'sendingRSocket' is required");
+		Assert.notNull(requester, "'requester' is required");
 		this.handler = handler;
-		this.requester = RSocketRequester.create(sendingRSocket, defaultDataMimeType, strategies);
+		this.requester = requester;
 		this.dataMimeType = defaultDataMimeType;
-		this.strategies = strategies;
+		this.bufferFactory = bufferFactory;
 	}
 
 
@@ -175,7 +175,7 @@ private String getDestination(Payload payload) {
 	}
 
 	private DataBuffer retainDataAndReleasePayload(Payload payload) {
-		return PayloadUtils.retainDataAndReleasePayload(payload, this.strategies.dataBufferFactory());
+		return PayloadUtils.retainDataAndReleasePayload(payload, this.bufferFactory);
 	}
 
 	private MessageHeaders createHeaders(String destination, @Nullable MonoProcessor<?> replyMono) {
@@ -189,8 +189,7 @@ private MessageHeaders createHeaders(String destination, @Nullable MonoProcessor
 		if (replyMono != null) {
 			headers.setHeader(RSocketPayloadReturnValueHandler.RESPONSE_HEADER, replyMono);
 		}
-		DataBufferFactory bufferFactory = this.strategies.dataBufferFactory();
-		headers.setHeader(HandlerMethodReturnValueHandler.DATA_BUFFER_FACTORY_HEADER, bufferFactory);
+		headers.setHeader(HandlerMethodReturnValueHandler.DATA_BUFFER_FACTORY_HEADER, this.bufferFactory);
 		return headers.getMessageHeaders();
 	}
 

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java

@@ -71,14 +71,30 @@ static RSocketRequester.Builder builder() {
 		return new DefaultRSocketRequesterBuilder();
 	}
 
+	/**
+	 * Wrap an existing {@link RSocket}. Typically used in a client or server
+	 * responder to wrap the remote {@code RSocket}.
+	 * @param rsocket the RSocket to wrap
+	 * @param dataMimeType the data MimeType, obtained from the
+	 * {@link io.rsocket.ConnectionSetupPayload} (server) or the
+	 * {@link io.rsocket.RSocketFactory.ClientRSocketFactory} (client)
+	 * @param strategies the strategies to use
+	 * @return the created RSocketRequester
+	 */
+	static RSocketRequester wrap(RSocket rsocket, @Nullable MimeType dataMimeType, RSocketStrategies strategies) {
+		return new DefaultRSocketRequester(rsocket, dataMimeType, strategies);
+	}
+
 	/**
 	 * Create a new {@code RSocketRequester} from the given {@link RSocket} and
 	 * strategies for encoding and decoding request and response payloads.
 	 * @param rsocket the sending RSocket to use
 	 * @param dataMimeType the MimeType for data (from the SETUP frame)
 	 * @param strategies encoders, decoders, and others
 	 * @return the created RSocketRequester wrapper
+	 * @deprecated use {@link #wrap(RSocket, MimeType, RSocketStrategies)} instead
 	 */
+	@Deprecated
 	static RSocketRequester create(RSocket rsocket, @Nullable MimeType dataMimeType, RSocketStrategies strategies) {
 		return new DefaultRSocketRequester(rsocket, dataMimeType, strategies);
 	}

spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java

@@ -70,7 +70,7 @@ public void setUp() {
 				.encoder(CharSequenceEncoder.allMimeTypes())
 				.build();
 		this.rsocket = new TestRSocket();
-		this.requester = RSocketRequester.create(rsocket, MimeTypeUtils.TEXT_PLAIN, strategies);
+		this.requester = RSocketRequester.wrap(this.rsocket, MimeTypeUtils.TEXT_PLAIN, strategies);
 	}