Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 943cb73

Browse files
artem-vartem-v
authored
Updated dependencies (#196)
1 parent 7840752 commit 943cb73

File tree

8 files changed

+65
-23
lines changed

8 files changed

+65
-23
lines changed

‎pom.xml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
@@ -33,13 +35,14 @@
3335
</scm>
3436

3537
<properties>
36-
<scalecube-cluster.version>2.6.13</scalecube-cluster.version>
37-
<scalecube-commons.version>1.0.21</scalecube-commons.version>
38-
<scalecube-services.version>2.10.24</scalecube-services.version>
38+
<scalecube-cluster.version>2.6.15</scalecube-cluster.version>
39+
<scalecube-commons.version>1.0.22</scalecube-commons.version>
40+
<scalecube-services.version>2.10.25</scalecube-services.version>
3941

40-
<reactor.version>2020.0.23</reactor.version>
42+
<reactor.version>2022.0.7</reactor.version>
4143
<rsocket.version>1.1.3</rsocket.version>
42-
<jackson.version>2.13.3</jackson.version>
44+
<jackson.version>2.15.1</jackson.version>
45+
<netty.version>4.1.92.Final</netty.version>
4346
<slf4j.version>1.7.36</slf4j.version>
4447
<log4j.version>2.17.2</log4j.version>
4548
<disruptor.version>3.4.2</disruptor.version>
@@ -104,6 +107,15 @@
104107
<scope>import</scope>
105108
</dependency>
106109

110+
<!-- Netty -->
111+
<dependency>
112+
<groupId>io.netty</groupId>
113+
<artifactId>netty-bom</artifactId>
114+
<version>${netty.version}</version>
115+
<type>pom</type>
116+
<scope>import</scope>
117+
</dependency>
118+
107119
<!-- Logging -->
108120
<dependency>
109121
<groupId>org.slf4j</groupId>

‎services-gateway-netty/src/main/java/io/scalecube/services/gateway/GatewayTemplate.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ public abstract class GatewayTemplate implements Gateway {
1515
protected final GatewayOptions options;
1616

1717
protected GatewayTemplate(GatewayOptions options) {
18-
this.options = new GatewayOptions(options);
18+
this.options =
19+
new GatewayOptions()
20+
.id(options.id())
21+
.port(options.port())
22+
.workerPool(options.workerPool())
23+
.call(options.call());
1924
}
2025

2126
@Override

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/AbstractGatewayExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private ServiceDiscovery serviceDiscovery(ServiceEndpoint serviceEndpoint) {
108108
return new ScalecubeServiceDiscovery()
109109
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
110110
.options(opts -> opts.metadata(serviceEndpoint))
111-
.membership(opts -> opts.seedMembers(gateway.discovery().address()));
111+
.membership(opts -> opts.seedMembers(gateway.discoveryAddress()));
112112
}
113113

114114
public void shutdownServices() {

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void beforEach() {
6161
new ScalecubeServiceDiscovery()
6262
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
6363
.options(opts -> opts.metadata(serviceEndpoint))
64-
.membership(opts -> opts.seedMembers(gateway.discovery().address())))
64+
.membership(opts -> opts.seedMembers(gateway.discoveryAddress())))
6565
.transport(RSocketServiceTransport::new)
6666
.services(new TestServiceImpl())
6767
.startAwait();
@@ -91,7 +91,7 @@ void testCloseServiceStreamAfterLostConnection() {
9191
.router(new StaticAddressRouter(gatewayAddress));
9292

9393
StepVerifier.create(serviceCall.api(TestService.class).oneNever("body").log("<<< "))
94-
.thenAwait(Duration.ofSeconds(1))
94+
.thenAwait(Duration.ofSeconds(5))
9595
.then(() -> client.close())
9696
.then(() -> client.onClose().block())
9797
.expectError(IOException.class)

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/rsocket/RSocketClientConnectionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void beforEach() {
7070
new ScalecubeServiceDiscovery()
7171
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
7272
.options(opts -> opts.metadata(serviceEndpoint))
73-
.membership(opts -> opts.seedMembers(gateway.discovery().address())))
73+
.membership(opts -> opts.seedMembers(gateway.discoveryAddress())))
7474
.transport(RSocketServiceTransport::new)
7575
.services(new TestServiceImpl(onCloseCounter::incrementAndGet))
7676
.startAwait();
@@ -100,7 +100,7 @@ void testCloseServiceStreamAfterLostConnection() {
100100
.router(new StaticAddressRouter(gatewayAddress));
101101

102102
StepVerifier.create(serviceCall.api(TestService.class).manyNever().log("<<< "))
103-
.thenAwait(Duration.ofSeconds(1))
103+
.thenAwait(Duration.ofSeconds(5))
104104
.then(() -> client.close())
105105
.then(() -> client.onClose().block())
106106
.expectError(IOException.class)

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void beforEach() {
8080
new ScalecubeServiceDiscovery()
8181
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
8282
.options(opts -> opts.metadata(serviceEndpoint))
83-
.membership(opts -> opts.seedMembers(gateway.discovery().address())))
83+
.membership(opts -> opts.seedMembers(gateway.discoveryAddress())))
8484
.transport(RSocketServiceTransport::new)
8585
.services(new TestServiceImpl(onCloseCounter::incrementAndGet))
8686
.startAwait();
@@ -110,7 +110,7 @@ void testCloseServiceStreamAfterLostConnection() {
110110
.router(new StaticAddressRouter(gatewayAddress));
111111

112112
StepVerifier.create(serviceCall.api(TestService.class).manyNever().log("<<< "))
113-
.thenAwait(Duration.ofSeconds(1))
113+
.thenAwait(Duration.ofSeconds(5))
114114
.then(() -> client.close())
115115
.then(() -> client.onClose().block())
116116
.expectError(IOException.class)
@@ -168,8 +168,11 @@ public void testHandlerEvents() throws InterruptedException {
168168

169169
@Test
170170
void testKeepalive()
171-
throws InterruptedException, NoSuchFieldException, IllegalAccessException,
172-
NoSuchMethodException, InvocationTargetException {
171+
throws InterruptedException,
172+
NoSuchFieldException,
173+
IllegalAccessException,
174+
NoSuchMethodException,
175+
InvocationTargetException {
173176

174177
int expectedKeepalives = 3;
175178
Duration keepAliveInterval = Duration.ofSeconds(1);

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.RepeatedTest;
2929
import reactor.core.publisher.Flux;
3030
import reactor.core.publisher.Mono;
31+
import reactor.netty.resources.LoopResources;
3132
import reactor.test.StepVerifier;
3233

3334
class WebsocketClientTest extends BaseTest {
@@ -39,9 +40,12 @@ class WebsocketClientTest extends BaseTest {
3940
private static Address gatewayAddress;
4041
private static Microservices service;
4142
private static GatewayClient client;
43+
private static LoopResources loopResources;
4244

4345
@BeforeAll
4446
static void beforeAll() {
47+
loopResources = LoopResources.create("websocket-gateway-client");
48+
4549
gateway =
4650
Microservices.builder()
4751
.discovery(
@@ -62,7 +66,7 @@ static void beforeAll() {
6266
new ScalecubeServiceDiscovery()
6367
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
6468
.options(opts -> opts.metadata(serviceEndpoint))
65-
.membership(opts -> opts.seedMembers(gateway.discovery().address())))
69+
.membership(opts -> opts.seedMembers(gateway.discoveryAddress())))
6670
.transport(RSocketServiceTransport::new)
6771
.services(new TestServiceImpl())
6872
.startAwait();
@@ -82,26 +86,33 @@ static void afterAll() {
8286
if (client != null) {
8387
client.close();
8488
}
89+
8590
Flux.concat(
8691
Mono.justOrEmpty(gateway).map(Microservices::shutdown),
8792
Mono.justOrEmpty(service).map(Microservices::shutdown))
8893
.then()
8994
.block();
95+
96+
if (loopResources != null) {
97+
loopResources.disposeLater().block();
98+
}
9099
}
91100

92-
@RepeatedTest(300)
101+
@RepeatedTest(100)
93102
void testMessageSequence() {
94103

95104
client =
96105
new WebsocketGatewayClient(
97-
GatewayClientSettings.builder().address(gatewayAddress).build(), CLIENT_CODEC);
106+
GatewayClientSettings.builder().address(gatewayAddress).build(),
107+
CLIENT_CODEC,
108+
loopResources);
98109

99110
ServiceCall serviceCall =
100111
new ServiceCall()
101112
.transport(new GatewayClientTransport(client))
102113
.router(new StaticAddressRouter(gatewayAddress));
103114

104-
int count = (int) 1e3;
115+
int count = 100;
105116

106117
StepVerifier.create(serviceCall.api(TestService.class).many(count) /*.log("<<< ")*/)
107118
.expectNextSequence(IntStream.range(0, count).boxed().collect(Collectors.toList()))

‎services-gateway-tests/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.RepeatedTest;
2929
import reactor.core.publisher.Flux;
3030
import reactor.core.publisher.Mono;
31+
import reactor.netty.resources.LoopResources;
3132
import reactor.test.StepVerifier;
3233

3334
class WebsocketServerTest extends BaseTest {
@@ -38,9 +39,12 @@ class WebsocketServerTest extends BaseTest {
3839
private static Microservices gateway;
3940
private static Address gatewayAddress;
4041
private static GatewayClient client;
42+
private static LoopResources loopResources;
4143

4244
@BeforeAll
4345
static void beforeAll() {
46+
loopResources = LoopResources.create("websocket-gateway-client");
47+
4448
gateway =
4549
Microservices.builder()
4650
.discovery(
@@ -71,22 +75,29 @@ static void afterAll() {
7175
if (client != null) {
7276
client.close();
7377
}
78+
7479
Mono.justOrEmpty(gateway).map(Microservices::shutdown).then().block();
80+
81+
if (loopResources != null) {
82+
loopResources.disposeLater().block();
83+
}
7584
}
7685

77-
@RepeatedTest(300)
86+
@RepeatedTest(100)
7887
void testMessageSequence() {
7988

8089
client =
8190
new WebsocketGatewayClient(
82-
GatewayClientSettings.builder().address(gatewayAddress).build(), CLIENT_CODEC);
91+
GatewayClientSettings.builder().address(gatewayAddress).build(),
92+
CLIENT_CODEC,
93+
loopResources);
8394

8495
ServiceCall serviceCall =
8596
new ServiceCall()
8697
.transport(new GatewayClientTransport(client))
8798
.router(new StaticAddressRouter(gatewayAddress));
8899

89-
int count = (int) 1e3;
100+
int count = 100;
90101

91102
StepVerifier.create(serviceCall.api(TestService.class).many(count) /*.log("<<< ")*/)
92103
.expectNextSequence(IntStream.range(0, count).boxed().collect(Collectors.toList()))

0 commit comments

Comments
 (0)