From 1069e91645504b703b0826f4709813795960e2f3 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Thu, 13 Aug 2020 17:21:00 -0600 Subject: [PATCH] RSocket Deprecations Stop using deprecated RSocket APIs in integration tests Issue gh-8948 --- .../annotation/rsocket/HelloHandler.java | 3 +-- .../rsocket/HelloRSocketITests.java | 20 +++++++------- .../config/annotation/rsocket/JwtITests.java | 24 +++++++++-------- ...RSocketMessageHandlerConnectionITests.java | 20 +++++++------- .../rsocket/RSocketMessageHandlerITests.java | 26 ++++++++++--------- .../rsocket/SimpleAuthenticationITests.java | 20 +++++++------- 6 files changed, 61 insertions(+), 52 deletions(-) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloHandler.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloHandler.java index 501822a65c..377a3abd0b 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloHandler.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloHandler.java @@ -15,7 +15,6 @@ */ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.AbstractRSocket; import io.rsocket.ConnectionSetupPayload; import io.rsocket.Payload; import io.rsocket.RSocket; @@ -28,7 +27,7 @@ public class HelloHandler implements SocketAcceptor { @Override public Mono accept(ConnectionSetupPayload setup, RSocket sendingSocket) { return Mono.just( - new AbstractRSocket() { + new RSocket() { @Override public Mono requestResponse(Payload payload) { String data = payload.getDataUtf8(); diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java index 876e22d2a5..32acc219cf 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java @@ -16,7 +16,10 @@ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.RSocketFactory; +import java.util.ArrayList; +import java.util.List; + +import io.rsocket.core.RSocketServer; import io.rsocket.frame.decoder.PayloadDecoder; import io.rsocket.transport.netty.server.CloseableChannel; import io.rsocket.transport.netty.server.TcpServerTransport; @@ -24,6 +27,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,9 +45,6 @@ import org.springframework.stereotype.Controller; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import java.util.ArrayList; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -68,12 +69,13 @@ public class HelloRSocketITests { @Before public void setup() { - this.server = RSocketFactory.receive() - .frameDecoder(PayloadDecoder.ZERO_COPY) - .addSocketAcceptorPlugin(this.interceptor) + this.server = RSocketServer.create() + .payloadDecoder(PayloadDecoder.ZERO_COPY) + .interceptors((registry) -> { + registry.forSocketAcceptor(this.interceptor); + }) .acceptor(this.handler.responder()) - .transport(TcpServerTransport.create("localhost", 0)) - .start() + .bind(TcpServerTransport.create("localhost", 0)) .block(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java index 6b08f11ffd..db183363a1 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java @@ -15,7 +15,11 @@ */ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.RSocketFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import io.rsocket.core.RSocketServer; import io.rsocket.frame.decoder.PayloadDecoder; import io.rsocket.transport.netty.server.CloseableChannel; import io.rsocket.transport.netty.server.TcpServerTransport; @@ -23,6 +27,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import reactor.core.publisher.Mono; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,11 +50,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; -import reactor.core.publisher.Mono; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import static io.rsocket.metadata.WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION; import static org.assertj.core.api.Assertions.assertThat; @@ -80,12 +81,13 @@ public class JwtITests { @Before public void setup() { - this.server = RSocketFactory.receive() - .frameDecoder(PayloadDecoder.ZERO_COPY) - .addSocketAcceptorPlugin(this.interceptor) + this.server = RSocketServer.create() + .payloadDecoder(PayloadDecoder.ZERO_COPY) + .interceptors((registry) -> { + registry.forSocketAcceptor(this.interceptor); + }) .acceptor(this.handler.responder()) - .transport(TcpServerTransport.create("localhost", 0)) - .start() + .bind(TcpServerTransport.create("localhost", 0)) .block(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 269bcbb951..1bf93f18a7 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -15,7 +15,10 @@ */ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.RSocketFactory; +import java.util.ArrayList; +import java.util.List; + +import io.rsocket.core.RSocketServer; import io.rsocket.exceptions.ApplicationErrorException; import io.rsocket.frame.decoder.PayloadDecoder; import io.rsocket.transport.netty.server.CloseableChannel; @@ -24,6 +27,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,9 +47,6 @@ import org.springframework.stereotype.Controller; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import java.util.ArrayList; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -74,12 +75,13 @@ public class RSocketMessageHandlerConnectionITests { @Before public void setup() { - this.server = RSocketFactory.receive() - .frameDecoder(PayloadDecoder.ZERO_COPY) - .addSocketAcceptorPlugin(this.interceptor) + this.server = RSocketServer.create() + .payloadDecoder(PayloadDecoder.ZERO_COPY) + .interceptors((registry) -> { + registry.forSocketAcceptor(this.interceptor); + }) .acceptor(this.handler.responder()) - .transport(TcpServerTransport.create("localhost", 0)) - .start() + .bind(TcpServerTransport.create("localhost", 0)) .block(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index 19f5e1010c..6f351e54e2 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -16,7 +16,11 @@ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.RSocketFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import io.rsocket.core.RSocketServer; import io.rsocket.exceptions.ApplicationErrorException; import io.rsocket.frame.decoder.PayloadDecoder; import io.rsocket.transport.netty.server.CloseableChannel; @@ -25,6 +29,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,12 +50,6 @@ import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata; import org.springframework.stereotype.Controller; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -74,12 +75,13 @@ public class RSocketMessageHandlerITests { @Before public void setup() { - this.server = RSocketFactory.receive() - .frameDecoder(PayloadDecoder.ZERO_COPY) - .addSocketAcceptorPlugin(this.interceptor) + this.server = RSocketServer.create() + .payloadDecoder(PayloadDecoder.ZERO_COPY) + .interceptors((registry) -> { + registry.forSocketAcceptor(this.interceptor); + }) .acceptor(this.handler.responder()) - .transport(TcpServerTransport.create("localhost", 0)) - .start() + .bind(TcpServerTransport.create("localhost", 0)) .block(); this.requester = RSocketRequester.builder() diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java index 9c9f4607c3..dec6fb2367 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java @@ -16,7 +16,10 @@ package org.springframework.security.config.annotation.rsocket; -import io.rsocket.RSocketFactory; +import java.util.ArrayList; +import java.util.List; + +import io.rsocket.core.RSocketServer; import io.rsocket.exceptions.ApplicationErrorException; import io.rsocket.frame.decoder.PayloadDecoder; import io.rsocket.transport.netty.server.CloseableChannel; @@ -25,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -46,9 +50,6 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; -import java.util.ArrayList; -import java.util.List; - import static io.rsocket.metadata.WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -74,12 +75,13 @@ public class SimpleAuthenticationITests { @Before public void setup() { - this.server = RSocketFactory.receive() - .frameDecoder(PayloadDecoder.ZERO_COPY) - .addSocketAcceptorPlugin(this.interceptor) + this.server = RSocketServer.create() + .payloadDecoder(PayloadDecoder.ZERO_COPY) + .interceptors((registry) -> { + registry.forSocketAcceptor(this.interceptor); + }) .acceptor(this.handler.responder()) - .transport(TcpServerTransport.create("localhost", 0)) - .start() + .bind(TcpServerTransport.create("localhost", 0)) .block(); }