root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Switch to Reactor and RSocket snapshots

This commit is contained in:
Rossen Stoyanchev 2020-09-07 13:30:28 +01:00
parent c5694506ae
commit 8c2852607d
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -25,9 +25,9 @@ configure(allprojects) { project ->
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.11.2"
mavenBom "io.netty:netty-bom:4.1.51.Final"
mavenBom "io.projectreactor:reactor-bom:2020.0.0-M2"
mavenBom "io.projectreactor:reactor-bom:2020.0.0-SNAPSHOT"
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR5"
mavenBom "io.rsocket:rsocket-bom:1.1.0-M1"
mavenBom "io.rsocket:rsocket-bom:1.1.0-SNAPSHOT"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.0"
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.9"
@ -285,7 +285,8 @@ configure(allprojects) { project ->
repositories {
mavenCentral()
maven { url "https://repo.spring.io/libs-spring-framework-build" }
maven { url "https://repo.spring.io/milestone" } // Reactor
maven { url "https://repo.spring.io/snapshot" } // Reactor
maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" } // RSocket
}
}
configurations.all {

5
spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java
View File

@ -22,8 +22,7 @@ import java.util.function.Consumer;
import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.RSocketClient;
import io.rsocket.core.RSocketClientAdapter;
import io.rsocket.core.RSocketClient;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -73,7 +72,7 @@ final class DefaultRSocketRequester implements RSocketRequester {
Assert.notNull(metadataMimeType, "'metadataMimeType' is required");
Assert.notNull(strategies, "RSocketStrategies is required");
this.rsocketClient = (rsocketClient != null ? rsocketClient : new RSocketClientAdapter(rsocket));
this.rsocketClient = (rsocketClient != null ? rsocketClient : RSocketClient.from(rsocket));
this.rsocket = rsocket;
this.dataMimeType = dataMimeType;
this.metadataMimeType = metadataMimeType;

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

@ -25,6 +25,7 @@ import java.util.Map;
import java.util.function.Consumer;
import io.rsocket.Payload;
import io.rsocket.core.RSocketClient;
import io.rsocket.core.RSocketConnector;
import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.metadata.WellKnownMimeType;
@ -170,11 +171,10 @@ final class DefaultRSocketRequesterBuilder implements RSocketRequester.Builder {
Mono<Payload> setupPayload = getSetupPayload(dataMimeType, metaMimeType, strategies);
RSocketConnector connector = initConnector(
this.rsocketConnectorConfigurers,
metaMimeType, dataMimeType, setupPayload, strategies);
this.rsocketConnectorConfigurers, metaMimeType, dataMimeType, setupPayload, strategies);
return new DefaultRSocketRequester(
connector.toRSocketClient(transport), null, dataMimeType, metaMimeType, strategies);
RSocketClient.from(connector.connect(transport)), null, dataMimeType, metaMimeType, strategies);
}
@Override

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

@ -22,7 +22,7 @@ import java.util.function.Consumer;
import io.rsocket.ConnectionSetupPayload;
import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.RSocketClient;
import io.rsocket.core.RSocketClient;
import io.rsocket.transport.ClientTransport;
import io.rsocket.transport.netty.client.TcpClientTransport;
import io.rsocket.transport.netty.client.WebsocketClientTransport;
@ -225,7 +225,7 @@ public interface RSocketRequester {
/**
* Build an {@link RSocketRequester} instance for use with a TCP
* transport. Requests are made via {@link io.rsocket.RSocketClient}
* transport. Requests are made via {@link io.rsocket.core.RSocketClient}
* which establishes a shared TCP connection to given host and port.
* @param host the host of the server to connect to
* @param port the port of the server to connect to
@ -236,7 +236,7 @@ public interface RSocketRequester {
/**
* Build an {@link RSocketRequester} instance for use with a WebSocket
* transport. Requests are made via {@link io.rsocket.RSocketClient}
* transport. Requests are made via {@link io.rsocket.core.RSocketClient}
* which establishes a shared WebSocket connection to given URL.
* @param uri the URL of the server to connect to
* @return the created {@code RSocketRequester}
@ -246,7 +246,7 @@ public interface RSocketRequester {
/**
* Build an {@link RSocketRequester} instance for use with the given
* transport. Requests are made via {@link io.rsocket.RSocketClient}
* transport. Requests are made via {@link io.rsocket.core.RSocketClient}
* which establishes a shared connection through the given transport.
* @param transport the transport to use for connecting to the server
* @return the created {@code RSocketRequester}