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

Commit 553cf0a

Browse files
segabrielsegabriel
authored
Update versions (#181)
1 parent 87c9ecc commit 553cf0a

File tree

9 files changed

+78
-16
lines changed

9 files changed

+78
-16
lines changed

‎pom.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@
5757
</scm>
5858

5959
<properties>
60-
<scalecube-services.version>2.10.18</scalecube-services.version>
60+
<scalecube-services.version>2.10.20</scalecube-services.version>
6161
<scalecube-commons.version>1.0.17</scalecube-commons.version>
62+
<scalecube-cluster.version>2.6.10</scalecube-cluster.version>
6263

63-
<reactor.version>2020.0.6</reactor.version>
64-
<rsocket.version>1.0.4</rsocket.version>
65-
<netty.version>4.1.63.Final</netty.version>
64+
<reactor.version>2020.0.10</reactor.version>
65+
<rsocket.version>1.0.5</rsocket.version>
66+
<netty.version>4.1.66.Final</netty.version>
6667
<jackson.version>2.11.0</jackson.version>
6768
<metrics.version>3.1.2</metrics.version>
6869
<slf4j.version>1.7.30</slf4j.version>
@@ -116,6 +117,11 @@
116117
<artifactId>scalecube-commons</artifactId>
117118
<version>${scalecube-commons.version}</version>
118119
</dependency>
120+
<dependency>
121+
<groupId>io.scalecube</groupId>
122+
<artifactId>scalecube-transport-netty</artifactId>
123+
<version>${scalecube-cluster.version}</version>
124+
</dependency>
119125

120126
<!-- Reactor -->
121127
<dependency>

‎services-gateway-tests/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<groupId>io.scalecube</groupId>
4343
<artifactId>scalecube-services-transport-jackson</artifactId>
4444
</dependency>
45+
<dependency>
46+
<groupId>io.scalecube</groupId>
47+
<artifactId>scalecube-transport-netty</artifactId>
48+
</dependency>
4549

4650
<dependency>
4751
<groupId>org.slf4j</groupId>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.scalecube.services.gateway.transport.StaticAddressRouter;
1212
import io.scalecube.services.transport.api.ClientTransport;
1313
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
14+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1415
import java.util.function.Function;
1516
import org.junit.jupiter.api.extension.AfterAllCallback;
1617
import org.junit.jupiter.api.extension.AfterEachCallback;
@@ -47,7 +48,12 @@ protected AbstractGatewayExtension(
4748
public final void beforeAll(ExtensionContext context) {
4849
gateway =
4950
Microservices.builder()
50-
.discovery("gateway", ScalecubeServiceDiscovery::new)
51+
.discovery(
52+
"gateway",
53+
serviceEndpoint ->
54+
new ScalecubeServiceDiscovery()
55+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
56+
.options(opts -> opts.metadata(serviceEndpoint)))
5157
.transport(RSocketServiceTransport::new)
5258
.gateway(
5359
options -> {
@@ -100,7 +106,9 @@ public void startServices() {
100106
}
101107

102108
private ServiceDiscovery serviceDiscovery(ServiceEndpoint serviceEndpoint) {
103-
return new ScalecubeServiceDiscovery(serviceEndpoint)
109+
return new ScalecubeServiceDiscovery()
110+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
111+
.options(opts -> opts.metadata(serviceEndpoint))
104112
.membership(opts -> opts.seedMembers(gateway.discovery("gateway").address()));
105113
}
106114

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.scalecube.services.examples.GreetingServiceImpl;
1414
import io.scalecube.services.gateway.BaseTest;
1515
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
16+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1617
import java.time.Duration;
1718
import org.junit.jupiter.api.AfterEach;
1819
import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +33,12 @@ public class CorsTest extends BaseTest {
3233

3334
private final Microservices.Builder gatewayBuilder =
3435
Microservices.builder()
35-
.discovery("gateway", ScalecubeServiceDiscovery::new)
36+
.discovery(
37+
"gateway",
38+
serviceEndpoint ->
39+
new ScalecubeServiceDiscovery()
40+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
41+
.options(opts -> opts.metadata(serviceEndpoint)))
3642
.transport(RSocketServiceTransport::new)
3743
.services(new GreetingServiceImpl());
3844
private HttpClient client;

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.scalecube.services.gateway.transport.StaticAddressRouter;
1717
import io.scalecube.services.gateway.transport.http.HttpGatewayClient;
1818
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
19+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1920
import java.io.IOException;
2021
import java.time.Duration;
2122
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,7 +43,12 @@ class HttpClientConnectionTest extends BaseTest {
4243
void beforEach() {
4344
gateway =
4445
Microservices.builder()
45-
.discovery("gateway", ScalecubeServiceDiscovery::new)
46+
.discovery(
47+
"gateway",
48+
serviceEndpoint ->
49+
new ScalecubeServiceDiscovery()
50+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
51+
.options(opts -> opts.metadata(serviceEndpoint)))
4652
.transport(RSocketServiceTransport::new)
4753
.gateway(options -> new HttpGateway(options.id("HTTP")))
4854
.startAwait();
@@ -54,7 +60,9 @@ void beforEach() {
5460
.discovery(
5561
"service",
5662
serviceEndpoint ->
57-
new ScalecubeServiceDiscovery(serviceEndpoint)
63+
new ScalecubeServiceDiscovery()
64+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
65+
.options(opts -> opts.metadata(serviceEndpoint))
5866
.membership(
5967
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
6068
.transport(RSocketServiceTransport::new)

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.scalecube.services.gateway.transport.StaticAddressRouter;
2222
import io.scalecube.services.gateway.transport.rsocket.RSocketGatewayClient;
2323
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
24+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
2425
import java.io.IOException;
2526
import java.time.Duration;
2627
import java.util.Collections;
@@ -51,7 +52,12 @@ void beforEach() {
5152
sessionEventHandler = new TestGatewaySessionHandler();
5253
gateway =
5354
Microservices.builder()
54-
.discovery("gateway", ScalecubeServiceDiscovery::new)
55+
.discovery(
56+
"gateway",
57+
serviceEndpoint ->
58+
new ScalecubeServiceDiscovery()
59+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
60+
.options(opts -> opts.metadata(serviceEndpoint)))
5561
.transport(RSocketServiceTransport::new)
5662
.gateway(options -> new RSocketGateway(options.id("RS"), sessionEventHandler))
5763
.startAwait();
@@ -63,7 +69,9 @@ void beforEach() {
6369
.discovery(
6470
"service",
6571
serviceEndpoint ->
66-
new ScalecubeServiceDiscovery(serviceEndpoint)
72+
new ScalecubeServiceDiscovery()
73+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
74+
.options(opts -> opts.metadata(serviceEndpoint))
6775
.membership(
6876
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
6977
.transport(RSocketServiceTransport::new)

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import io.scalecube.services.gateway.transport.websocket.WebsocketGatewayClientSession;
2727
import io.scalecube.services.gateway.ws.WebsocketGateway;
2828
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
29+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
2930
import java.io.IOException;
3031
import java.lang.reflect.Field;
3132
import java.lang.reflect.InvocationTargetException;
@@ -61,7 +62,12 @@ void beforEach() {
6162
this.sessionEventHandler = new TestGatewaySessionHandler();
6263
gateway =
6364
Microservices.builder()
64-
.discovery("gateway", ScalecubeServiceDiscovery::new)
65+
.discovery(
66+
"gateway",
67+
serviceEndpoint ->
68+
new ScalecubeServiceDiscovery()
69+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
70+
.options(opts -> opts.metadata(serviceEndpoint)))
6571
.transport(RSocketServiceTransport::new)
6672
.gateway(options -> new WebsocketGateway(options.id("WS"), sessionEventHandler))
6773
.startAwait();
@@ -73,7 +79,9 @@ void beforEach() {
7379
.discovery(
7480
"service",
7581
serviceEndpoint ->
76-
new ScalecubeServiceDiscovery(serviceEndpoint)
82+
new ScalecubeServiceDiscovery()
83+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
84+
.options(opts -> opts.metadata(serviceEndpoint))
7785
.membership(
7886
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
7987
.transport(RSocketServiceTransport::new)

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.scalecube.services.gateway.transport.websocket.WebsocketGatewayClient;
1919
import io.scalecube.services.gateway.ws.WebsocketGateway;
2020
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
21+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
2122
import java.time.Duration;
2223
import java.util.concurrent.ThreadLocalRandom;
2324
import java.util.stream.Collectors;
@@ -45,7 +46,12 @@ class WebsocketClientTest extends BaseTest {
4546
static void beforeAll() {
4647
gateway =
4748
Microservices.builder()
48-
.discovery("gateway", ScalecubeServiceDiscovery::new)
49+
.discovery(
50+
"gateway",
51+
serviceEndpoint ->
52+
new ScalecubeServiceDiscovery()
53+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
54+
.options(opts -> opts.metadata(serviceEndpoint)))
4955
.transport(RSocketServiceTransport::new)
5056
.gateway(
5157
options -> new WebsocketGateway(options.id("WS"), new TestGatewaySessionHandler()))
@@ -57,7 +63,9 @@ static void beforeAll() {
5763
.discovery(
5864
"service",
5965
serviceEndpoint ->
60-
new ScalecubeServiceDiscovery(serviceEndpoint)
66+
new ScalecubeServiceDiscovery()
67+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
68+
.options(opts -> opts.metadata(serviceEndpoint))
6169
.membership(
6270
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
6371
.transport(RSocketServiceTransport::new)

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.scalecube.services.gateway.transport.websocket.WebsocketGatewayClient;
1919
import io.scalecube.services.gateway.ws.WebsocketGateway;
2020
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
21+
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
2122
import java.time.Duration;
2223
import java.util.concurrent.ThreadLocalRandom;
2324
import java.util.stream.Collectors;
@@ -44,7 +45,12 @@ class WebsocketServerTest extends BaseTest {
4445
static void beforeAll() {
4546
gateway =
4647
Microservices.builder()
47-
.discovery("gateway", ScalecubeServiceDiscovery::new)
48+
.discovery(
49+
"gateway",
50+
serviceEndpoint ->
51+
new ScalecubeServiceDiscovery()
52+
.transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
53+
.options(opts -> opts.metadata(serviceEndpoint)))
4854
.transport(RSocketServiceTransport::new)
4955
.gateway(
5056
options -> new WebsocketGateway(options.id("WS"), new TestGatewaySessionHandler()))

0 commit comments

Comments
 (0)