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

Commit 01b9a3e

Browse files
artem-vartem-v
authored
Merge pull request #149 from scalecube/update-services
Updated services
2 parents 48a6c00 + 40f3efb commit 01b9a3e

File tree

9 files changed

+24
-29
lines changed

9 files changed

+24
-29
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<properties>
2525
<scalecube-commons.version>1.0.4</scalecube-commons.version>
26-
<scalecube-services.version>2.10.0-RC1</scalecube-services.version>
26+
<scalecube-services.version>2.10.0-RC2</scalecube-services.version>
2727
<scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
2828
<scalecube-config.version>0.4.3</scalecube-config.version>
2929
<reactor.version>Dysprosium-SR8</reactor.version>

‎services-gateway-benchmarks/src/main/java/io/scalecube/services/benchmarks/gateway/distributed/DistributedBenchmarkState.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ protected void beforeAll() throws Exception {
3838
.gateway(opts -> new RSocketGateway(opts.id("rsws")))
3939
.gateway(opts -> new WebsocketGateway(opts.id("ws")))
4040
.gateway(opts -> new HttpGateway(opts.id("http")))
41-
.discovery(ScalecubeServiceDiscovery::new)
41+
.discovery("gateway", ScalecubeServiceDiscovery::new)
4242
.transport(RSocketServiceTransport::new)
4343
.startAwait();
4444

45-
Address seedAddress = gateway.discovery().address();
45+
Address seedAddress = gateway.discovery("gateway").address();
4646
int numOfThreads = Runtime.getRuntime().availableProcessors();
4747
services =
4848
Microservices.builder()
4949
.discovery(
50+
"services",
5051
serviceEndpoint ->
5152
new ScalecubeServiceDiscovery(serviceEndpoint)
52-
.options(
53-
config -> config.membership(opts -> opts.seedMembers(seedAddress))))
53+
.membership(opts -> opts.seedMembers(seedAddress)))
5454
.transport(() -> new RSocketServiceTransport().numOfWorkers(numOfThreads))
5555
.services(new BenchmarkServiceImpl())
5656
.startAwait();

‎services-gateway-benchmarks/src/main/java/io/scalecube/services/benchmarks/gateway/standalone/StandaloneBenchmarkState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected void beforeAll() throws Exception {
3737
.gateway(opts -> new RSocketGateway(opts.id("rsws")))
3838
.gateway(opts -> new WebsocketGateway(opts.id("ws")))
3939
.gateway(opts -> new HttpGateway(opts.id("http")))
40-
.discovery(ScalecubeServiceDiscovery::new)
40+
.discovery("microservices", ScalecubeServiceDiscovery::new)
4141
.transport(RSocketServiceTransport::new)
4242
.startAwait();
4343
}

‎services-gateway-runner/src/main/java/io/scalecube/services/gateway/GatewayRunner.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ public class GatewayRunner {
3434
* Main runner.
3535
*
3636
* @param args program arguments
37-
* @throws Exception exception thrown
3837
*/
39-
public static void main(String[] args) throws Exception {
38+
public static void main(String[] args) {
4039
ConfigRegistry configRegistry = ConfigBootstrap.configRegistry();
4140

4241
Config config =
@@ -50,7 +49,7 @@ public static void main(String[] args) throws Exception {
5049
LOGGER.info(DECORATOR);
5150

5251
Microservices.builder()
53-
.discovery(serviceEndpoint -> serviceDiscovery(serviceEndpoint, config))
52+
.discovery("gateway", serviceEndpoint -> serviceDiscovery(serviceEndpoint, config))
5453
.transport(() -> newServiceTransport(config))
5554
.gateway(opts -> new WebsocketGateway(opts.id("ws").port(7070)))
5655
.gateway(

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected AbstractGatewayExtension(
4646
public final void beforeAll(ExtensionContext context) {
4747
gateway =
4848
Microservices.builder()
49-
.discovery(ScalecubeServiceDiscovery::new)
49+
.discovery("gateway", ScalecubeServiceDiscovery::new)
5050
.transport(RSocketServiceTransport::new)
5151
.gateway(
5252
options -> {
@@ -91,7 +91,7 @@ public ServiceCall client() {
9191
public void startServices() {
9292
services =
9393
Microservices.builder()
94-
.discovery(this::serviceDiscovery)
94+
.discovery("services", this::serviceDiscovery)
9595
.transport(RSocketServiceTransport::new)
9696
.services(serviceInstance)
9797
.startAwait();
@@ -100,8 +100,7 @@ public void startServices() {
100100

101101
private ServiceDiscovery serviceDiscovery(ServiceEndpoint serviceEndpoint) {
102102
return new ScalecubeServiceDiscovery(serviceEndpoint)
103-
.options(
104-
config -> config.membership(opts -> opts.seedMembers(gateway.discovery().address())));
103+
.membership(opts -> opts.seedMembers(gateway.discovery("gateway").address()));
105104
}
106105

107106
public void shutdownServices() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CorsTest extends BaseTest {
3232

3333
private final Microservices.Builder gatewayBuilder =
3434
Microservices.builder()
35-
.discovery(ScalecubeServiceDiscovery::new)
35+
.discovery("gateway", ScalecubeServiceDiscovery::new)
3636
.transport(RSocketServiceTransport::new)
3737
.services(new GreetingServiceImpl());
3838
private HttpClient client;

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class HttpClientConnectionTest extends BaseTest {
4242
void beforEach() {
4343
gateway =
4444
Microservices.builder()
45-
.discovery(ScalecubeServiceDiscovery::new)
45+
.discovery("gateway", ScalecubeServiceDiscovery::new)
4646
.transport(RSocketServiceTransport::new)
4747
.gateway(options -> new HttpGateway(options.id("HTTP")))
4848
.startAwait();
@@ -52,12 +52,11 @@ void beforEach() {
5252
service =
5353
Microservices.builder()
5454
.discovery(
55+
"service",
5556
serviceEndpoint ->
5657
new ScalecubeServiceDiscovery(serviceEndpoint)
57-
.options(
58-
config ->
59-
config.membership(
60-
opts -> opts.seedMembers(gateway.discovery().address()))))
58+
.membership(
59+
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
6160
.transport(RSocketServiceTransport::new)
6261
.services(new TestServiceImpl())
6362
.startAwait();

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void beforEach() {
5151
sessionEventHandler = new TestGatewaySessionHandler();
5252
gateway =
5353
Microservices.builder()
54-
.discovery(ScalecubeServiceDiscovery::new)
54+
.discovery("gateway", ScalecubeServiceDiscovery::new)
5555
.transport(RSocketServiceTransport::new)
5656
.gateway(options -> new RSocketGateway(options.id("RS"), sessionEventHandler))
5757
.startAwait();
@@ -61,12 +61,11 @@ void beforEach() {
6161
service =
6262
Microservices.builder()
6363
.discovery(
64+
"service",
6465
serviceEndpoint ->
6566
new ScalecubeServiceDiscovery(serviceEndpoint)
66-
.options(
67-
config ->
68-
config.membership(
69-
opts -> opts.seedMembers(gateway.discovery().address()))))
67+
.membership(
68+
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
7069
.transport(RSocketServiceTransport::new)
7170
.services(new TestServiceImpl(onCloseCounter::incrementAndGet))
7271
.startAwait();

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void beforEach() {
6161
this.sessionEventHandler = new TestGatewaySessionHandler();
6262
gateway =
6363
Microservices.builder()
64-
.discovery(ScalecubeServiceDiscovery::new)
64+
.discovery("gateway", ScalecubeServiceDiscovery::new)
6565
.transport(RSocketServiceTransport::new)
6666
.gateway(options -> new WebsocketGateway(options.id("WS"), sessionEventHandler))
6767
.startAwait();
@@ -71,12 +71,11 @@ void beforEach() {
7171
service =
7272
Microservices.builder()
7373
.discovery(
74+
"service",
7475
serviceEndpoint ->
7576
new ScalecubeServiceDiscovery(serviceEndpoint)
76-
.options(
77-
config ->
78-
config.membership(
79-
opts -> opts.seedMembers(gateway.discovery().address()))))
77+
.membership(
78+
opts -> opts.seedMembers(gateway.discovery("gateway").address())))
8079
.transport(RSocketServiceTransport::new)
8180
.services(new TestServiceImpl(onCloseCounter::incrementAndGet))
8281
.startAwait();

0 commit comments

Comments
 (0)