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

Remove usage of removed SF deprecated classes

Browse Source 
Related to https://github.com/spring-projects/spring-framework/issues/25548
This commit is contained in:
Artem Bilan
2020-08-06 10:21:15 -04:00
parent cd63763bb4
commit 9989344c0b
2 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java
View File

@@ -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

15
spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java
View File

@@ -53,7 +53,8 @@ public class ServerRSocketConnector extends AbstractRSocketConnector implements
private final ServerTransport<CloseableChannel> serverTransport;
private Consumer<RSocketServer> serverConfigurer = (rsocketServer) -> { };
private Consumer<RSocketServer> serverConfigurer = (rsocketServer) -> {
};
private Mono<CloseableChannel> 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<io.rsocket.RSocketFactory.ServerRSocketFactory> 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}.