Skip to content

Commit 1069e91

Browse files
jzheauxjzheaux
committed
RSocket Deprecations
Stop using deprecated RSocket APIs in integration tests Issue gh-8948
1 parent a4756cf commit 1069e91

File tree

6 files changed

+61
-52
lines changed

6 files changed

+61
-52
lines changed

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.security.config.annotation.rsocket;
1717

18-
import io.rsocket.AbstractRSocket;
1918
import io.rsocket.ConnectionSetupPayload;
2019
import io.rsocket.Payload;
2120
import io.rsocket.RSocket;
@@ -28,7 +27,7 @@ public class HelloHandler implements SocketAcceptor {
2827
@Override
2928
public Mono<RSocket> accept(ConnectionSetupPayload setup, RSocket sendingSocket) {
3029
return Mono.just(
31-
new AbstractRSocket() {
30+
new RSocket() {
3231
@Override
3332
public Mono<Payload> requestResponse(Payload payload) {
3433
String data = payload.getDataUtf8();

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@
1616

1717
package org.springframework.security.config.annotation.rsocket;
1818

19-
import io.rsocket.RSocketFactory;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
22+
import io.rsocket.core.RSocketServer;
2023
import io.rsocket.frame.decoder.PayloadDecoder;
2124
import io.rsocket.transport.netty.server.CloseableChannel;
2225
import io.rsocket.transport.netty.server.TcpServerTransport;
2326
import org.junit.After;
2427
import org.junit.Before;
2528
import org.junit.Test;
2629
import org.junit.runner.RunWith;
30+
2731
import org.springframework.beans.factory.annotation.Autowired;
2832
import org.springframework.context.annotation.Bean;
2933
import org.springframework.context.annotation.Configuration;
@@ -41,9 +45,6 @@
4145
import org.springframework.test.context.ContextConfiguration;
4246
import org.springframework.test.context.junit4.SpringRunner;
4347

44-
import java.util.ArrayList;
45-
import java.util.List;
46-
4748
import static org.assertj.core.api.Assertions.assertThat;
4849
import static org.assertj.core.api.Assertions.assertThatCode;
4950

@@ -68,12 +69,13 @@ public class HelloRSocketITests {
6869

6970
@Before
7071
public void setup() {
71-
this.server = RSocketFactory.receive()
72-
.frameDecoder(PayloadDecoder.ZERO_COPY)
73-
.addSocketAcceptorPlugin(this.interceptor)
72+
this.server = RSocketServer.create()
73+
.payloadDecoder(PayloadDecoder.ZERO_COPY)
74+
.interceptors((registry) -> {
75+
registry.forSocketAcceptor(this.interceptor);
76+
})
7477
.acceptor(this.handler.responder())
75-
.transport(TcpServerTransport.create("localhost", 0))
76-
.start()
78+
.bind(TcpServerTransport.create("localhost", 0))
7779
.block();
7880
}
7981

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,20 @@
1515
*/
1616
package org.springframework.security.config.annotation.rsocket;
1717

18-
import io.rsocket.RSocketFactory;
18+
import java.util.ArrayList;
19+
import java.util.Arrays;
20+
import java.util.List;
21+
22+
import io.rsocket.core.RSocketServer;
1923
import io.rsocket.frame.decoder.PayloadDecoder;
2024
import io.rsocket.transport.netty.server.CloseableChannel;
2125
import io.rsocket.transport.netty.server.TcpServerTransport;
2226
import org.junit.After;
2327
import org.junit.Before;
2428
import org.junit.Test;
2529
import org.junit.runner.RunWith;
30+
import reactor.core.publisher.Mono;
31+
2632
import org.springframework.beans.factory.annotation.Autowired;
2733
import org.springframework.context.annotation.Bean;
2834
import org.springframework.context.annotation.Configuration;
@@ -44,11 +50,6 @@
4450
import org.springframework.test.context.junit4.SpringRunner;
4551
import org.springframework.util.MimeType;
4652
import org.springframework.util.MimeTypeUtils;
47-
import reactor.core.publisher.Mono;
48-
49-
import java.util.ArrayList;
50-
import java.util.Arrays;
51-
import java.util.List;
5253

5354
import static io.rsocket.metadata.WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION;
5455
import static org.assertj.core.api.Assertions.assertThat;
@@ -80,12 +81,13 @@ public class JwtITests {
8081

8182
@Before
8283
public void setup() {
83-
this.server = RSocketFactory.receive()
84-
.frameDecoder(PayloadDecoder.ZERO_COPY)
85-
.addSocketAcceptorPlugin(this.interceptor)
84+
this.server = RSocketServer.create()
85+
.payloadDecoder(PayloadDecoder.ZERO_COPY)
86+
.interceptors((registry) -> {
87+
registry.forSocketAcceptor(this.interceptor);
88+
})
8689
.acceptor(this.handler.responder())
87-
.transport(TcpServerTransport.create("localhost", 0))
88-
.start()
90+
.bind(TcpServerTransport.create("localhost", 0))
8991
.block();
9092
}
9193

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
*/
1616
package org.springframework.security.config.annotation.rsocket;
1717

18-
import io.rsocket.RSocketFactory;
18+
import java.util.ArrayList;
19+
import java.util.List;
20+
21+
import io.rsocket.core.RSocketServer;
1922
import io.rsocket.exceptions.ApplicationErrorException;
2023
import io.rsocket.frame.decoder.PayloadDecoder;
2124
import io.rsocket.transport.netty.server.CloseableChannel;
@@ -24,6 +27,7 @@
2427
import org.junit.Before;
2528
import org.junit.Test;
2629
import org.junit.runner.RunWith;
30+
2731
import org.springframework.beans.factory.annotation.Autowired;
2832
import org.springframework.context.annotation.Bean;
2933
import org.springframework.context.annotation.Configuration;
@@ -43,9 +47,6 @@
4347
import org.springframework.test.context.ContextConfiguration;
4448
import org.springframework.test.context.junit4.SpringRunner;
4549

46-
import java.util.ArrayList;
47-
import java.util.List;
48-
4950
import static org.assertj.core.api.Assertions.assertThat;
5051
import static org.assertj.core.api.Assertions.assertThatCode;
5152

@@ -74,12 +75,13 @@ public class RSocketMessageHandlerConnectionITests {
7475

7576
@Before
7677
public void setup() {
77-
this.server = RSocketFactory.receive()
78-
.frameDecoder(PayloadDecoder.ZERO_COPY)
79-
.addSocketAcceptorPlugin(this.interceptor)
78+
this.server = RSocketServer.create()
79+
.payloadDecoder(PayloadDecoder.ZERO_COPY)
80+
.interceptors((registry) -> {
81+
registry.forSocketAcceptor(this.interceptor);
82+
})
8083
.acceptor(this.handler.responder())
81-
.transport(TcpServerTransport.create("localhost", 0))
82-
.start()
84+
.bind(TcpServerTransport.create("localhost", 0))
8385
.block();
8486
}
8587

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616

1717
package org.springframework.security.config.annotation.rsocket;
1818

19-
import io.rsocket.RSocketFactory;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
import java.util.concurrent.TimeUnit;
22+
23+
import io.rsocket.core.RSocketServer;
2024
import io.rsocket.exceptions.ApplicationErrorException;
2125
import io.rsocket.frame.decoder.PayloadDecoder;
2226
import io.rsocket.transport.netty.server.CloseableChannel;
@@ -25,6 +29,9 @@
2529
import org.junit.Before;
2630
import org.junit.Test;
2731
import org.junit.runner.RunWith;
32+
import reactor.core.publisher.Flux;
33+
import reactor.core.publisher.Mono;
34+
2835
import org.springframework.beans.factory.annotation.Autowired;
2936
import org.springframework.context.annotation.Bean;
3037
import org.springframework.context.annotation.Configuration;
@@ -43,12 +50,6 @@
4350
import org.springframework.stereotype.Controller;
4451
import org.springframework.test.context.ContextConfiguration;
4552
import org.springframework.test.context.junit4.SpringRunner;
46-
import reactor.core.publisher.Flux;
47-
import reactor.core.publisher.Mono;
48-
49-
import java.util.ArrayList;
50-
import java.util.List;
51-
import java.util.concurrent.TimeUnit;
5253

5354
import static org.assertj.core.api.Assertions.assertThat;
5455
import static org.assertj.core.api.Assertions.assertThatCode;
@@ -74,12 +75,13 @@ public class RSocketMessageHandlerITests {
7475

7576
@Before
7677
public void setup() {
77-
this.server = RSocketFactory.receive()
78-
.frameDecoder(PayloadDecoder.ZERO_COPY)
79-
.addSocketAcceptorPlugin(this.interceptor)
78+
this.server = RSocketServer.create()
79+
.payloadDecoder(PayloadDecoder.ZERO_COPY)
80+
.interceptors((registry) -> {
81+
registry.forSocketAcceptor(this.interceptor);
82+
})
8083
.acceptor(this.handler.responder())
81-
.transport(TcpServerTransport.create("localhost", 0))
82-
.start()
84+
.bind(TcpServerTransport.create("localhost", 0))
8385
.block();
8486

8587
this.requester = RSocketRequester.builder()

‎config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
package org.springframework.security.config.annotation.rsocket;
1818

19-
import io.rsocket.RSocketFactory;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
22+
import io.rsocket.core.RSocketServer;
2023
import io.rsocket.exceptions.ApplicationErrorException;
2124
import io.rsocket.frame.decoder.PayloadDecoder;
2225
import io.rsocket.transport.netty.server.CloseableChannel;
@@ -25,6 +28,7 @@
2528
import org.junit.Before;
2629
import org.junit.Test;
2730
import org.junit.runner.RunWith;
31+
2832
import org.springframework.beans.factory.annotation.Autowired;
2933
import org.springframework.context.annotation.Bean;
3034
import org.springframework.context.annotation.Configuration;
@@ -46,9 +50,6 @@
4650
import org.springframework.util.MimeType;
4751
import org.springframework.util.MimeTypeUtils;
4852

49-
import java.util.ArrayList;
50-
import java.util.List;
51-
5253
import static io.rsocket.metadata.WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION;
5354
import static org.assertj.core.api.Assertions.assertThat;
5455
import static org.assertj.core.api.Assertions.assertThatCode;
@@ -74,12 +75,13 @@ public class SimpleAuthenticationITests {
7475

7576
@Before
7677
public void setup() {
77-
this.server = RSocketFactory.receive()
78-
.frameDecoder(PayloadDecoder.ZERO_COPY)
79-
.addSocketAcceptorPlugin(this.interceptor)
78+
this.server = RSocketServer.create()
79+
.payloadDecoder(PayloadDecoder.ZERO_COPY)
80+
.interceptors((registry) -> {
81+
registry.forSocketAcceptor(this.interceptor);
82+
})
8083
.acceptor(this.handler.responder())
81-
.transport(TcpServerTransport.create("localhost", 0))
82-
.start()
84+
.bind(TcpServerTransport.create("localhost", 0))
8385
.block();
8486
}
8587

0 commit comments

Comments
 (0)