Skip to content

Commit 29885e2

Browse files
committed
Upgrade to RSocket 1.1-M2 and Reactor 2020.0.0-RC1
Closes gh-25729 Closes gh-25728
1 parent 3b0f14f commit 29885e2

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ configure(allprojects) { project ->
2525
imports {
2626
mavenBom "com.fasterxml.jackson:jackson-bom:2.11.2"
2727
mavenBom "io.netty:netty-bom:4.1.51.Final"
28-
mavenBom "io.projectreactor:reactor-bom:2020.0.0-SNAPSHOT"
28+
mavenBom "io.projectreactor:reactor-bom:2020.0.0-RC1"
2929
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR6"
30-
mavenBom "io.rsocket:rsocket-bom:1.1.0-SNAPSHOT"
30+
mavenBom "io.rsocket:rsocket-bom:1.1.0-M2"
3131
mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723"
3232
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.0"
3333
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.9"
@@ -285,7 +285,7 @@ configure(allprojects) { project ->
285285
repositories {
286286
mavenCentral()
287287
maven { url "https://repo.spring.io/libs-spring-framework-build" }
288-
maven { url "https://repo.spring.io/snapshot" } // Reactor and RSocket
288+
maven { url "https://repo.spring.io/milestone" } // Reactor
289289
}
290290
}
291291
configurations.all {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import io.netty.buffer.ByteBufAllocator;
3030
import io.rsocket.ConnectionSetupPayload;
3131
import io.rsocket.DuplexConnection;
32+
import io.rsocket.RSocketErrorException;
3233
import io.rsocket.core.DefaultConnectionSetupPayload;
3334
import io.rsocket.core.RSocketConnector;
3435
import io.rsocket.frame.decoder.PayloadDecoder;
@@ -242,14 +243,12 @@ public ByteBuf setupFrame() {
242243
}
243244

244245
@Override
245-
public Mono<Void> send(Publisher<ByteBuf> frames) {
246-
return Mono.empty();
246+
public void sendFrame(int i, ByteBuf byteBuf) {
247+
this.setupFrame = this.setupFrame == null ? byteBuf : this.setupFrame;
247248
}
248249

249250
@Override
250-
public Mono<Void> sendOne(ByteBuf frame) {
251-
this.setupFrame = frame;
252-
return Mono.empty();
251+
public void sendErrorAndClose(RSocketErrorException e) {
253252
}
254253

255254
@Override

0 commit comments

Comments
 (0)