Fixed tests

Author: artem-v

pom.xml

@@ -23,7 +23,7 @@
 
   <properties>
     <scalecube-commons.version>1.0.4</scalecube-commons.version>
-    <scalecube-services.version>2.10.0-RC1</scalecube-services.version>
+    <scalecube-services.version>2.10.0-RC2</scalecube-services.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.4.3</scalecube-config.version>
     <reactor.version>Dysprosium-SR8</reactor.version>

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

@@ -34,9 +34,8 @@ public class GatewayRunner {
    * Main runner.
    *
    * @param args program arguments
-   * @throws Exception exception thrown
    */
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     ConfigRegistry configRegistry = ConfigBootstrap.configRegistry();
 
     Config config =
@@ -50,7 +49,7 @@ public static void main(String[] args) throws Exception {
     LOGGER.info(DECORATOR);
 
     Microservices.builder()
-        .discovery(serviceEndpoint -> serviceDiscovery(serviceEndpoint, config))
+        .discovery("gateway", serviceEndpoint -> serviceDiscovery(serviceEndpoint, config))
         .transport(() -> newServiceTransport(config))
         .gateway(opts -> new WebsocketGateway(opts.id("ws").port(7070)))
         .gateway(

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

@@ -46,7 +46,7 @@ protected AbstractGatewayExtension(
   public final void beforeAll(ExtensionContext context) {
     gateway =
         Microservices.builder()
-            .discovery(ScalecubeServiceDiscovery::new)
+            .discovery("gateway", ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
             .gateway(
                 options -> {
@@ -91,7 +91,7 @@ public ServiceCall client() {
   public void startServices() {
     services =
         Microservices.builder()
-            .discovery(this::serviceDiscovery)
+            .discovery("services", this::serviceDiscovery)
             .transport(RSocketServiceTransport::new)
             .services(serviceInstance)
             .startAwait();
@@ -100,8 +100,7 @@ public void startServices() {
 
   private ServiceDiscovery serviceDiscovery(ServiceEndpoint serviceEndpoint) {
     return new ScalecubeServiceDiscovery(serviceEndpoint)
-        .options(
-            config -> config.membership(opts -> opts.seedMembers(gateway.discovery().address())));
+        .membership(opts -> opts.seedMembers(gateway.discovery("gateway").address()));
   }
 
   public void shutdownServices() {

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

@@ -32,7 +32,7 @@ public class CorsTest extends BaseTest {
 
   private final Microservices.Builder gatewayBuilder =
       Microservices.builder()
-          .discovery(ScalecubeServiceDiscovery::new)
+          .discovery("gateway", ScalecubeServiceDiscovery::new)
           .transport(RSocketServiceTransport::new)
           .services(new GreetingServiceImpl());
   private HttpClient client;

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

@@ -42,7 +42,7 @@ class HttpClientConnectionTest extends BaseTest {
   void beforEach() {
     gateway =
         Microservices.builder()
-            .discovery(ScalecubeServiceDiscovery::new)
+            .discovery("gateway", ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
             .gateway(options -> new HttpGateway(options.id("HTTP")))
             .startAwait();
@@ -52,12 +52,11 @@ void beforEach() {
     service =
         Microservices.builder()
             .discovery(
+                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery(serviceEndpoint)
-                        .options(
-                            config ->
-                                config.membership(
-                                    opts -> opts.seedMembers(gateway.discovery().address()))))
+                        .membership(
+                            opts -> opts.seedMembers(gateway.discovery("gateway").address())))
             .transport(RSocketServiceTransport::new)
             .services(new TestServiceImpl())
             .startAwait();

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

@@ -51,7 +51,7 @@ void beforEach() {
     sessionEventHandler = new TestGatewaySessionHandler();
     gateway =
         Microservices.builder()
-            .discovery(ScalecubeServiceDiscovery::new)
+            .discovery("gateway", ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
             .gateway(options -> new RSocketGateway(options.id("RS"), sessionEventHandler))
             .startAwait();
@@ -61,12 +61,11 @@ void beforEach() {
     service =
         Microservices.builder()
             .discovery(
+                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery(serviceEndpoint)
-                        .options(
-                            config ->
-                                config.membership(
-                                    opts -> opts.seedMembers(gateway.discovery().address()))))
+                        .membership(
+                            opts -> opts.seedMembers(gateway.discovery("gateway").address())))
             .transport(RSocketServiceTransport::new)
             .services(new TestServiceImpl(onCloseCounter::incrementAndGet))
             .startAwait();

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

@@ -61,7 +61,7 @@ void beforEach() {
     this.sessionEventHandler = new TestGatewaySessionHandler();
     gateway =
         Microservices.builder()
-            .discovery(ScalecubeServiceDiscovery::new)
+            .discovery("gateway", ScalecubeServiceDiscovery::new)
             .transport(RSocketServiceTransport::new)
             .gateway(options -> new WebsocketGateway(options.id("WS"), sessionEventHandler))
             .startAwait();
@@ -71,12 +71,11 @@ void beforEach() {
     service =
         Microservices.builder()
             .discovery(
+                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery(serviceEndpoint)
-                        .options(
-                            config ->
-                                config.membership(
-                                    opts -> opts.seedMembers(gateway.discovery().address()))))
+                        .membership(
+                            opts -> opts.seedMembers(gateway.discovery("gateway").address())))
             .transport(RSocketServiceTransport::new)
             .services(new TestServiceImpl(onCloseCounter::incrementAndGet))
             .startAwait();