Skip to content

Commit b2a0978

Browse files
committed
Prepare for Sinks API updates in Reactor
See reactor/reactor-core#2374 All usages of this API are in tests, which are not checking overflow or concurrent emissions - so a simple replacement with `try***` equivalents is fine.
1 parent af3dc5d commit b2a0978

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private static class PayloadInterceptor implements RSocket, RSocketInterceptor {
246246
void checkForLeaks() {
247247
this.rsockets.stream().map(PayloadSavingDecorator::getPayloads)
248248
.forEach(payloadInfoProcessor -> {
249-
payloadInfoProcessor.emitComplete();
249+
payloadInfoProcessor.tryEmitComplete();
250250
payloadInfoProcessor.asFlux()
251251
.doOnNext(this::checkForLeak)
252252
.blockLast();
@@ -328,7 +328,7 @@ public Flux<io.rsocket.Payload> requestChannel(Publisher<io.rsocket.Payload> pay
328328
}
329329

330330
private io.rsocket.Payload addPayload(io.rsocket.Payload payload) {
331-
this.payloads.emitNext(new PayloadLeakInfo(payload));
331+
this.payloads.tryEmitNext(new PayloadLeakInfo(payload));
332332
return payload;
333333
}
334334

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static class ServerController {
231231

232232
@MessageMapping("receive")
233233
void receive(String payload) {
234-
this.fireForgetPayloads.emitNext(payload);
234+
this.fireForgetPayloads.tryEmitNext(payload);
235235
}
236236

237237
@MessageMapping("echo")
@@ -273,7 +273,7 @@ Mono<Void> voidReturnValue(String payload) {
273273

274274
@ConnectMapping("foo-updates")
275275
public void handleMetadata(@Header("foo") String foo) {
276-
this.metadataPushPayloads.emitNext(foo);
276+
this.metadataPushPayloads.tryEmitNext(foo);
277277
}
278278

279279
@MessageExceptionHandler

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private static class ClientHandler {
219219

220220
@MessageMapping("receive")
221221
void receive(String payload) {
222-
this.fireForgetPayloads.emitNext(payload);
222+
this.fireForgetPayloads.tryEmitNext(payload);
223223
}
224224

225225
@MessageMapping("echo")

spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ public void fluxNotHandled() {
371371
this.messageHandler.handleMessage(message);
372372

373373
assertThat(controller.fluxSink).isNotNull();
374-
controller.fluxSink.emitNext("foo");
374+
controller.fluxSink.tryEmitNext("foo");
375375

376376
verify(this.converter, never()).toMessage(any(), any(MessageHeaders.class));
377377
}

spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ class RSocketClientToServerCoroutinesIntegrationTests {
149149

150150
@MessageMapping("receive")
151151
fun receive(payload: String) {
152-
fireForgetPayloads.emitNext(payload)
152+
fireForgetPayloads.tryEmitNext(payload)
153153
}
154154

155155
@MessageMapping("receive-async")
156156
suspend fun receiveAsync(payload: String) {
157157
delay(10)
158-
fireForgetPayloads.emitNext(payload)
158+
fireForgetPayloads.tryEmitNext(payload)
159159
}
160160

161161
@MessageMapping("echo-async")

spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private String decodeToString(Part part) {
209209
public void singleSubscriberWithResource() throws IOException {
210210
Sinks.Many<Resource> sink = Sinks.many().unicast().onBackpressureBuffer();
211211
Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg");
212-
sink.emitNext(logo);
212+
sink.tryEmitNext(logo);
213213

214214
MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder();
215215
bodyBuilder.asyncPart("logo", sink.asFlux(), Resource.class);

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ public void deferredResultSubscriberWithMultipleValues() throws Exception {
140140

141141
Sinks.Many<Bar> sink = Sinks.many().unicast().onBackpressureBuffer();
142142
testDeferredResultSubscriber(sink.asFlux(), Flux.class, forClass(Bar.class), () -> {
143-
sink.emitNext(bar1);
144-
sink.emitNext(bar2);
145-
sink.emitComplete();
143+
sink.tryEmitNext(bar1);
144+
sink.tryEmitNext(bar2);
145+
sink.tryEmitComplete();
146146
}, Arrays.asList(bar1, bar2));
147147
}
148148

@@ -195,10 +195,10 @@ public void writeServerSentEvents() throws Exception {
195195
EmitterHandler emitterHandler = new EmitterHandler();
196196
sseEmitter.initialize(emitterHandler);
197197

198-
sink.emitNext("foo");
199-
sink.emitNext("bar");
200-
sink.emitNext("baz");
201-
sink.emitComplete();
198+
sink.tryEmitNext("foo");
199+
sink.tryEmitNext("bar");
200+
sink.tryEmitNext("baz");
201+
sink.tryEmitComplete();
202202

203203
assertThat(emitterHandler.getValuesAsText()).isEqualTo("data:foo\n\ndata:bar\n\ndata:baz\n\n");
204204
}
@@ -214,10 +214,10 @@ public void writeServerSentEventsWithBuilder() throws Exception {
214214
EmitterHandler emitterHandler = new EmitterHandler();
215215
sseEmitter.initialize(emitterHandler);
216216

217-
sink.emitNext(ServerSentEvent.builder("foo").id("1").build());
218-
sink.emitNext(ServerSentEvent.builder("bar").id("2").build());
219-
sink.emitNext(ServerSentEvent.builder("baz").id("3").build());
220-
sink.emitComplete();
217+
sink.tryEmitNext(ServerSentEvent.builder("foo").id("1").build());
218+
sink.tryEmitNext(ServerSentEvent.builder("bar").id("2").build());
219+
sink.tryEmitNext(ServerSentEvent.builder("baz").id("3").build());
220+
sink.tryEmitComplete();
221221

222222
assertThat(emitterHandler.getValuesAsText()).isEqualTo("id:1\ndata:foo\n\nid:2\ndata:bar\n\nid:3\ndata:baz\n\n");
223223
}
@@ -239,9 +239,9 @@ public void writeStreamJson() throws Exception {
239239
Bar bar1 = new Bar("foo");
240240
Bar bar2 = new Bar("bar");
241241

242-
sink.emitNext(bar1);
243-
sink.emitNext(bar2);
244-
sink.emitComplete();
242+
sink.tryEmitNext(bar1);
243+
sink.tryEmitNext(bar2);
244+
sink.tryEmitComplete();
245245

246246
assertThat(message.getHeaders().getContentType().toString()).isEqualTo("application/x-ndjson");
247247
assertThat(emitterHandler.getValues()).isEqualTo(Arrays.asList(bar1, "\n", bar2, "\n"));
@@ -256,10 +256,10 @@ public void writeText() throws Exception {
256256
EmitterHandler emitterHandler = new EmitterHandler();
257257
emitter.initialize(emitterHandler);
258258

259-
sink.emitNext("The quick");
260-
sink.emitNext(" brown fox jumps over ");
261-
sink.emitNext("the lazy dog");
262-
sink.emitComplete();
259+
sink.tryEmitNext("The quick");
260+
sink.tryEmitNext(" brown fox jumps over ");
261+
sink.tryEmitNext("the lazy dog");
262+
sink.tryEmitComplete();
263263

264264
assertThat(emitterHandler.getValuesAsText()).isEqualTo("The quick brown fox jumps over the lazy dog");
265265
}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ public void responseBodyFlux() throws Exception {
233233
assertThat(this.request.isAsyncStarted()).isTrue();
234234
assertThat(this.response.getStatus()).isEqualTo(200);
235235

236-
sink.emitNext("foo");
237-
sink.emitNext("bar");
238-
sink.emitNext("baz");
239-
sink.emitComplete();
236+
sink.tryEmitNext("foo");
237+
sink.tryEmitNext("bar");
238+
sink.tryEmitNext("baz");
239+
sink.tryEmitComplete();
240240

241241
assertThat(this.response.getContentType()).isEqualTo("text/event-stream");
242242
assertThat(this.response.getContentAsString()).isEqualTo("data:foo\n\ndata:bar\n\ndata:baz\n\n");
@@ -254,8 +254,8 @@ public void responseBodyFluxWithError() throws Exception {
254254
assertThat(this.request.isAsyncStarted()).isTrue();
255255

256256
IllegalStateException ex = new IllegalStateException("wah wah");
257-
sink.emitError(ex);
258-
sink.emitComplete();
257+
sink.tryEmitError(ex);
258+
sink.tryEmitComplete();
259259

260260
WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.webRequest);
261261
assertThat(asyncManager.getConcurrentResult()).isSameAs(ex);
@@ -299,10 +299,10 @@ public void responseEntityFlux() throws Exception {
299299
assertThat(this.request.isAsyncStarted()).isTrue();
300300
assertThat(this.response.getStatus()).isEqualTo(200);
301301

302-
sink.emitNext("foo");
303-
sink.emitNext("bar");
304-
sink.emitNext("baz");
305-
sink.emitComplete();
302+
sink.tryEmitNext("foo");
303+
sink.tryEmitNext("bar");
304+
sink.tryEmitNext("baz");
305+
sink.tryEmitComplete();
306306

307307
assertThat(this.response.getContentType()).isEqualTo("text/plain");
308308
assertThat(this.response.getContentAsString()).isEqualTo("foobarbaz");

0 commit comments

Comments
 (0)