diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java index e648146494..2678b4298e 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java @@ -89,27 +89,6 @@ public class ClientRSocketConnector extends AbstractRSocketConnector { this.clientTransport = clientTransport; } - /** - * Callback to configure the {@code ClientRSocketFactory} directly. - * Note: this class adds extra {@link org.springframework.messaging.rsocket.ClientRSocketFactoryConfigurer} to the - * target {@link RSocketRequester} to populate a reference to an internal - * {@link IntegrationRSocketMessageHandler#responder()}. - * This overrides possible external - * {@link io.rsocket.RSocketFactory.ClientRSocketFactory#acceptor(io.rsocket.SocketAcceptor)} - * @param factoryConfigurer the {@link org.springframework.messaging.rsocket.ClientRSocketFactoryConfigurer} to - * configure the {@link io.rsocket.RSocketFactory.ClientRSocketFactory}. - * @see RSocketRequester.Builder#rsocketFactory(org.springframework.messaging.rsocket.ClientRSocketFactoryConfigurer) - * @deprecated since 5.2.6 in favor of {@link #setConnectorConfigurer(RSocketConnectorConfigurer)} - */ - @Deprecated - public void setFactoryConfigurer( - org.springframework.messaging.rsocket.ClientRSocketFactoryConfigurer factoryConfigurer) { - - Assert.notNull(factoryConfigurer, "'factoryConfigurer' must not be null"); - setConnectorConfigurer((connector) -> - factoryConfigurer.configure(new io.rsocket.RSocketFactory.ClientRSocketFactory(connector))); - } - /** * Callback to configure the {@code ClientRSocketFactory} directly. * Note: this class adds extra {@link RSocketConnectorConfigurer} to the diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java index f2a804d3d8..443851b51d 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java @@ -53,7 +53,8 @@ public class ServerRSocketConnector extends AbstractRSocketConnector implements private final ServerTransport serverTransport; - private Consumer serverConfigurer = (rsocketServer) -> { }; + private Consumer serverConfigurer = (rsocketServer) -> { + }; private Mono serverMono; @@ -103,18 +104,6 @@ public class ServerRSocketConnector extends AbstractRSocketConnector implements return (ServerRSocketMessageHandler) this.rSocketMessageHandler; } - /** - * Provide a {@link Consumer} to configure the {@link io.rsocket.RSocketFactory.ServerRSocketFactory}. - * @param factoryConfigurer the {@link Consumer} to configure the {@link io.rsocket.RSocketFactory.ServerRSocketFactory}. - * @deprecated since 5.2.6 in favor of {@link #setServerConfigurer(Consumer)} - */ - @Deprecated - public void setFactoryConfigurer(Consumer factoryConfigurer) { - Assert.notNull(factoryConfigurer, "'factoryConfigurer' must not be null"); - setServerConfigurer((server) -> - factoryConfigurer.accept(new io.rsocket.RSocketFactory.ServerRSocketFactory(server))); - } - /** * Provide a {@link Consumer} to configure the {@link RSocketServer}. * @param serverConfigurer the {@link Consumer} to configure the {@link RSocketServer}.