Enhance microservices builder (#823)

artem-v · web-flow · commit fb3603de6ac6 · 2021-10-25T13:57:09.000+03:00
* Added "default" shortcut id for discovery
diff --git a/services-api/src/test/java/io/scalecube/services/methods/ReflectTest.java b/services-api/src/test/java/io/scalecube/services/methods/ReflectTest.java
@@ -123,9 +123,7 @@ public String name() {
     }
   }
 
-  private class SubServiceImpl extends ServiceImpl {
-      
-  }
+  private class SubServiceImpl extends ServiceImpl {}
 
   @Test
   public void testSubServiceInterfaces() {
@@ -134,7 +132,6 @@ public void testSubServiceInterfaces() {
     Stream<Class<?>> interfaces = Reflect.serviceInterfaces(new SubServiceImpl());
     // Then:
     Assertions.assertEquals(
-        1,
-        interfaces.count(), "serviceInterfaces(..) should detect interfaces in SubServiceImpl");
+        1, interfaces.count(), "serviceInterfaces(..) should detect interfaces in SubServiceImpl");
   }
 }
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java b/services-examples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java
@@ -26,7 +26,6 @@ public static void main(String[] args) {
     Microservices service =
         Microservices.builder()
             .discovery(
-                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -44,7 +43,7 @@ public static void main(String[] args) {
 
     Microservices userProfileCaller =
         Microservices.builder()
-            .discovery("caller", endpoint -> discovery(service, endpoint))
+            .discovery(endpoint -> discovery(service, endpoint))
             .transport(
                 () -> new RSocketServiceTransport().credentialsSupplier(credentialsSupplier()))
             .startAwait();
@@ -60,7 +59,7 @@ public static void main(String[] args) {
 
     Microservices apiKeyCaller =
         Microservices.builder()
-            .discovery("caller", endpoint -> discovery(service, endpoint))
+            .discovery(endpoint -> discovery(service, endpoint))
             .transport(
                 () -> new RSocketServiceTransport().credentialsSupplier(credentialsSupplier()))
             .startAwait();
@@ -161,6 +160,6 @@ private static ScalecubeServiceDiscovery discovery(
     return new ScalecubeServiceDiscovery()
         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
         .options(opts -> opts.metadata(endpoint))
-        .membership(opts -> opts.seedMembers(service.discovery("service").address()));
+        .membership(opts -> opts.seedMembers(service.discovery().address()));
   }
 }
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/auth/ServiceTransportAuthExample.java b/services-examples/src/main/java/io/scalecube/services/examples/auth/ServiceTransportAuthExample.java
@@ -24,7 +24,6 @@ public static void main(String[] args) {
     Microservices service =
         Microservices.builder()
             .discovery(
-                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -35,7 +34,7 @@ public static void main(String[] args) {
 
     Microservices caller =
         Microservices.builder()
-            .discovery("caller", endpoint -> discovery(service, endpoint))
+            .discovery(endpoint -> discovery(service, endpoint))
             .transport(() -> new RSocketServiceTransport().credentialsSupplier(credsSupplier()))
             .startAwait();
 
@@ -80,6 +79,6 @@ private static ScalecubeServiceDiscovery discovery(
     return new ScalecubeServiceDiscovery()
         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
         .options(opts -> opts.metadata(endpoint))
-        .membership(opts -> opts.seedMembers(service.discovery("service").address()));
+        .membership(opts -> opts.seedMembers(service.discovery().address()));
   }
 }
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/codecs/Example1.java b/services-examples/src/main/java/io/scalecube/services/examples/codecs/Example1.java
@@ -20,11 +20,10 @@ public class Example1 {
    * @param args ignored
    */
   public static void main(String[] args) {
-    // ScaleCube Node node with no members
+    // ScaleCube Node with no members
     Microservices seed =
         Microservices.builder()
             .discovery(
-                "seed",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -33,13 +32,12 @@ public static void main(String[] args) {
             .defaultContentType(PROTOSTUFF) // set explicit default data format
             .startAwait();
 
-    final Address seedAddress = seed.discovery("seed").address();
+    final Address seedAddress = seed.discovery().address();
 
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices ms =
         Microservices.builder()
             .discovery(
-                "ms",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/exceptions/ExceptionMapperExample.java b/services-examples/src/main/java/io/scalecube/services/examples/exceptions/ExceptionMapperExample.java
@@ -20,7 +20,6 @@ public static void main(String[] args) throws InterruptedException {
     Microservices ms1 =
         Microservices.builder()
             .discovery(
-                "ms1",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -35,12 +34,11 @@ public static void main(String[] args) throws InterruptedException {
 
     System.err.println("ms1 started: " + ms1.serviceAddress());
 
-    final Address address1 = ms1.discovery("ms1").address();
+    final Address address1 = ms1.discovery().address();
 
     Microservices ms2 =
         Microservices.builder()
             .discovery(
-                "ms2",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example1.java b/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example1.java
@@ -25,19 +25,18 @@ public class Example1 {
    * @param args ignored
    */
   public static void main(String[] args) {
-    // ScaleCube Node node with no members
+    // ScaleCube Node with no members
     Microservices seed =
         Microservices.builder()
             .discovery(
-                "seed",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                         .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
 
-    final Address seedAddress = seed.discovery("seed").address();
+    final Address seedAddress = seed.discovery().address();
 
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices ms =
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example2.java b/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example2.java
@@ -45,12 +45,11 @@ public static void main(String[] args) {
             .startAwait();
 
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
-    final Address seedAddress = seed.discovery("seed").address();
+    final Address seedAddress = seed.discovery().address();
 
     Microservices ms =
         Microservices.builder()
             .discovery(
-                "ms",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example3.java b/services-examples/src/main/java/io/scalecube/services/examples/helloworld/Example3.java
@@ -26,25 +26,23 @@ public class Example3 {
    * @param args ignored
    */
   public static void main(String[] args) {
-    // ScaleCube Node node with no members
+    // ScaleCube Node with no members
     Microservices seed =
         Microservices.builder()
             .discovery(
-                "seed",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                         .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
 
-    final Address seedAddress = seed.discovery("seed").address();
+    final Address seedAddress = seed.discovery().address();
 
     // Construct a ScaleCube node which joins the cluster hosting the Greeting Service
     Microservices ms =
         Microservices.builder()
             .discovery(
-                "ms",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/services/Example1.java b/services-examples/src/main/java/io/scalecube/services/examples/services/Example1.java
@@ -19,20 +19,18 @@ public static void main(String[] args) {
     Microservices gateway =
         Microservices.builder()
             .discovery(
-                "gateway",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                         .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
 
-    final Address gatewayAddress = gateway.discovery("gateway").address();
+    final Address gatewayAddress = gateway.discovery().address();
 
     Microservices service2Node =
         Microservices.builder()
             .discovery(
-                "service2Node",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -45,7 +43,6 @@ public static void main(String[] args) {
     Microservices service1Node =
         Microservices.builder()
             .discovery(
-                "service1Node",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services-examples/src/main/java/io/scalecube/services/examples/services/Example2.java b/services-examples/src/main/java/io/scalecube/services/examples/services/Example2.java
@@ -19,20 +19,18 @@ public static void main(String[] args) {
     Microservices gateway =
         Microservices.builder()
             .discovery(
-                "gateway",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                         .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
 
-    final Address gatewayAddress = gateway.discovery("gateway").address();
+    final Address gatewayAddress = gateway.discovery().address();
 
     Microservices service2Node =
         Microservices.builder()
             .discovery(
-                "service2Node",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -45,7 +43,6 @@ public static void main(String[] args) {
     Microservices service1Node =
         Microservices.builder()
             .discovery(
-                "service1Node",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services/src/main/java/io/scalecube/services/Microservices.java b/services/src/main/java/io/scalecube/services/Microservices.java
@@ -312,6 +312,16 @@ public List<ServiceEndpoint> serviceEndpoints() {
     return serviceRegistry.listServiceEndpoints();
   }
 
+  /**
+   * Returns default service discovery context.
+   *
+   * @see Microservices.Builder#discovery(String, ServiceDiscoveryFactory)
+   * @return service discovery context
+   */
+  public ServiceDiscoveryContext discovery() {
+    return discovery("default");
+  }
+
   /**
    * Returns service discovery context by id.
    *
@@ -459,6 +469,10 @@ public Builder methodRegistry(ServiceMethodRegistry methodRegistry) {
       return this;
     }
 
+    public Builder discovery(ServiceDiscoveryFactory discoveryFactory) {
+      return discovery("default", discoveryFactory);
+    }
+
     public Builder discovery(String id, ServiceDiscoveryFactory discoveryFactory) {
       this.compositeDiscovery.addOperator(opts -> opts.id(id).discoveryFactory(discoveryFactory));
       return this;
diff --git a/services/src/test/java/io/scalecube/services/ErrorFlowTest.java b/services/src/test/java/io/scalecube/services/ErrorFlowTest.java
@@ -33,7 +33,6 @@ public static void initNodes() {
     provider =
         Microservices.builder()
             .discovery(
-                "provider",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -43,12 +42,11 @@ public static void initNodes() {
             .services(new GreetingServiceImpl())
             .startAwait();
 
-    final Address seedAddress = provider.discovery("provider").address();
+    final Address seedAddress = provider.discovery().address();
 
     consumer =
         Microservices.builder()
             .discovery(
-                "consumer",
                 endpoint ->
                     new ScalecubeServiceDiscovery()
                         .membership(cfg -> cfg.seedMembers(seedAddress))
diff --git a/services/src/test/java/io/scalecube/services/ServiceAuthRemoteTest.java b/services/src/test/java/io/scalecube/services/ServiceAuthRemoteTest.java
@@ -77,7 +77,6 @@ static void beforeAll() {
     service =
         Microservices.builder()
             .discovery(
-                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -92,7 +91,6 @@ static void beforeAll() {
     serviceWithoutAuthenticator =
         Microservices.builder()
             .discovery(
-                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -107,7 +105,6 @@ static void beforeAll() {
     partiallySecuredService =
         Microservices.builder()
             .discovery(
-                "service",
                 serviceEndpoint ->
                     new ScalecubeServiceDiscovery()
                         .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
@@ -285,7 +282,7 @@ void successfulCallOfPublicMethodWithoutAuthentication() {
 
   private static Microservices newCaller() {
     return Microservices.builder()
-        .discovery("caller", ServiceAuthRemoteTest::serviceDiscovery)
+        .discovery(ServiceAuthRemoteTest::serviceDiscovery)
         .transport(
             () ->
                 new RSocketServiceTransport()
@@ -295,14 +292,14 @@ private static Microservices newCaller() {
 
   private static Microservices newEmptyCredentialsCaller() {
     return Microservices.builder()
-        .discovery("caller", ServiceAuthRemoteTest::serviceDiscovery)
+        .discovery(ServiceAuthRemoteTest::serviceDiscovery)
         .transport(RSocketServiceTransport::new)
         .startAwait();
   }
 
   private static Microservices newInvalidCredentialsCaller() {
     return Microservices.builder()
-        .discovery("caller", ServiceAuthRemoteTest::serviceDiscovery)
+        .discovery(ServiceAuthRemoteTest::serviceDiscovery)
         .transport(
             () ->
                 new RSocketServiceTransport()
@@ -339,8 +336,8 @@ private static ServiceDiscovery serviceDiscovery(ServiceEndpoint endpoint) {
         .membership(
             opts ->
                 opts.seedMembers(
-                    service.discovery("service").address(),
-                    serviceWithoutAuthenticator.discovery("service").address(),
-                    partiallySecuredService.discovery("service").address()));
+                    service.discovery().address(),
+                    serviceWithoutAuthenticator.discovery().address(),
+                    partiallySecuredService.discovery().address()));
   }
 }
diff --git a/services/src/test/java/io/scalecube/services/ServiceCallLocalTest.java b/services/src/test/java/io/scalecube/services/ServiceCallLocalTest.java
@@ -74,7 +74,6 @@ public void test_local_async_no_params() {
   private static Microservices serviceProvider() {
     return Microservices.builder()
         .discovery(
-            "serviceProvider",
             serviceEndpoint ->
                 new ScalecubeServiceDiscovery()
                     .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services/src/test/java/io/scalecube/services/ServiceCallRemoteTest.java b/services/src/test/java/io/scalecube/services/ServiceCallRemoteTest.java
@@ -75,12 +75,11 @@ public static void tearDown() {
   private static Microservices serviceProvider(Object service) {
     return Microservices.builder()
         .discovery(
-            "serviceProvider",
             endpoint ->
                 new ScalecubeServiceDiscovery()
                     .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                     .options(opts -> opts.metadata(endpoint))
-                    .membership(cfg -> cfg.seedMembers(gateway.discovery("gateway").address())))
+                    .membership(cfg -> cfg.seedMembers(gateway.discovery().address())))
         .transport(RSocketServiceTransport::new)
         .services(service)
         .startAwait();
@@ -302,7 +301,6 @@ private static Optional<ServiceReference> route(
   private static Microservices gateway() {
     return Microservices.builder()
         .discovery(
-            "gateway",
             serviceEndpoint ->
                 new ScalecubeServiceDiscovery()
                     .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
diff --git a/services/src/test/java/io/scalecube/services/ServiceRegistryTest.java b/services/src/test/java/io/scalecube/services/ServiceRegistryTest.java
diff --git a/services/src/test/java/io/scalecube/services/ServiceRemoteTest.java b/services/src/test/java/io/scalecube/services/ServiceRemoteTest.java
diff --git a/services/src/test/java/io/scalecube/services/StreamingServiceTest.java b/services/src/test/java/io/scalecube/services/StreamingServiceTest.java
diff --git a/services/src/test/java/io/scalecube/services/routings/RoutersTest.java b/services/src/test/java/io/scalecube/services/routings/RoutersTest.java
diff --git a/services/src/test/java/io/scalecube/services/routings/ServiceTagsExample.java b/services/src/test/java/io/scalecube/services/routings/ServiceTagsExample.java
diff --git a/services/src/test/java/io/scalecube/services/transport/rsocket/RSocketNettyColocatedEventLoopGroupTest.java b/services/src/test/java/io/scalecube/services/transport/rsocket/RSocketNettyColocatedEventLoopGroupTest.java
diff --git a/services/src/test/java/io/scalecube/services/transport/rsocket/RSocketServiceTransportTest.java b/services/src/test/java/io/scalecube/services/transport/rsocket/RSocketServiceTransportTest.java

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,7 @@ public String name() {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- private class SubServiceImpl extends ServiceImpl {`
`127`		`-`
`128`		`- }`
	`126`	`+ private class SubServiceImpl extends ServiceImpl {}`
`129`	`127`
`130`	`128`	`@Test`
`131`	`129`	`public void testSubServiceInterfaces() {`
`@@ -134,7 +132,6 @@ public void testSubServiceInterfaces() {`
`134`	`132`	`Stream<Class<?>> interfaces = Reflect.serviceInterfaces(new SubServiceImpl());`
`135`	`133`	`// Then:`
`136`	`134`	`Assertions.assertEquals(`
`137`		`- 1,`
`138`		`- interfaces.count(), "serviceInterfaces(..) should detect interfaces in SubServiceImpl");`
	`135`	`+ 1, interfaces.count(), "serviceInterfaces(..) should detect interfaces in SubServiceImpl");`
`139`	`136`	`}`
`140`	`137`	`}`