Update versions (#819)

* Update versions. * Set the cluster transport and its metadata explicitly.
scalecube · Aug 19, 2021 · 413708c · 413708c
1 parent f0cda59
commit 413708c
Show file tree

Hide file tree

Showing 27 changed files with 286 additions and 80 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,18 +57,18 @@
   </scm>
 
   <properties>
-    <scalecube-cluster.version>2.6.9</scalecube-cluster.version>
+    <scalecube-cluster.version>2.6.10</scalecube-cluster.version>
     <scalecube-commons.version>1.0.17</scalecube-commons.version>
     <scalecube-security.version>1.0.19</scalecube-security.version>
 
-    <reactor.version>2020.0.6</reactor.version>
+    <reactor.version>2020.0.10</reactor.version>
     <jackson.version>2.11.0</jackson.version>
-    <rsocket.version>1.0.4</rsocket.version>
+    <rsocket.version>1.0.5</rsocket.version>
     <protostuff.version>1.6.0</protostuff.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j.version>2.13.2</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
-    <netty.version>4.1.63.Final</netty.version>
+    <netty.version>4.1.66.Final</netty.version>
     <snakeyaml.version>1.26</snakeyaml.version>
 
     <jsr305.version>3.0.2</jsr305.version>
@@ -116,6 +116,11 @@
         <artifactId>scalecube-codec-jackson</artifactId>
         <version>${scalecube-cluster.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.scalecube</groupId>
+        <artifactId>scalecube-transport-netty</artifactId>
+        <version>${scalecube-cluster.version}</version>
+      </dependency>
 
       <!-- Reactor -->
       <dependency>

diff --git a/services-discovery/pom.xml b/services-discovery/pom.xml
@@ -38,6 +38,11 @@
       <artifactId>scalecube-codec-jackson</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-transport-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/...es-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java b/...es-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java
@@ -18,11 +18,9 @@
 import io.scalecube.services.discovery.api.ServiceDiscovery;
 import io.scalecube.services.discovery.api.ServiceDiscoveryContext;
 import io.scalecube.services.discovery.api.ServiceDiscoveryEvent;
-import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.lang.management.ManagementFactory;
 import java.nio.ByteBuffer;
 import java.util.List;
-import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.UnaryOperator;
@@ -41,26 +39,16 @@ public final class ScalecubeServiceDiscovery implements ServiceDiscovery {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ServiceDiscovery.class);
 
-  private final ServiceEndpoint serviceEndpoint;
-
   private ClusterConfig clusterConfig;
   private Cluster cluster;
 
   // Sink
   private final Sinks.Many<ServiceDiscoveryEvent> sink =
       Sinks.many().multicast().directBestEffort();
 
-  /**
-   * Constructor.
-   *
-   * @param serviceEndpoint service endpoint
-   */
-  public ScalecubeServiceDiscovery(ServiceEndpoint serviceEndpoint) {
-    this.serviceEndpoint = Objects.requireNonNull(serviceEndpoint, "serviceEndpoint");
-    this.clusterConfig =
-        ClusterConfig.defaultLanConfig()
-            .metadata(serviceEndpoint)
-            .transport(opts -> opts.transportFactory(new WebsocketTransportFactory()));
+  /** Constructor. */
+  public ScalecubeServiceDiscovery() {
+    this.clusterConfig = ClusterConfig.defaultLanConfig();
   }
 
   /**
@@ -69,7 +57,6 @@ public ScalecubeServiceDiscovery(ServiceEndpoint serviceEndpoint) {
    * @param other other instance
    */
   private ScalecubeServiceDiscovery(ScalecubeServiceDiscovery other) {
-    this.serviceEndpoint = other.serviceEndpoint;
     this.clusterConfig = other.clusterConfig;
     this.cluster = other.cluster;
   }
@@ -255,7 +242,7 @@ private static JmxMonitorMBean start(ScalecubeServiceDiscovery instance) throws
       jmxMBean.init();
       ObjectName objectName =
           new ObjectName(
-              String.format(OBJECT_NAME_FORMAT, instance.serviceEndpoint.id(), System.nanoTime()));
+              String.format(OBJECT_NAME_FORMAT, instance.cluster.member().id(), System.nanoTime()));
       StandardMBean standardMBean = new StandardMBean(jmxMBean, MonitorMBean.class);
       mbeanServer.registerMBean(standardMBean, objectName);
       return jmxMBean;

diff --git a/...iscovery/src/test/java/io/scalecube/services/discovery/ScalecubeServiceDiscoveryTest.java b/...iscovery/src/test/java/io/scalecube/services/discovery/ScalecubeServiceDiscoveryTest.java
@@ -18,6 +18,7 @@
 import io.scalecube.services.ServiceRegistration;
 import io.scalecube.services.discovery.api.ServiceDiscovery;
 import io.scalecube.services.discovery.api.ServiceDiscoveryEvent;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -224,16 +225,20 @@ private Mono<ServiceDiscovery> newServiceDiscovery(
       Address seedAddress, MetadataCodec metadataCodec) {
     return Mono.fromCallable(
         () ->
-            new ScalecubeServiceDiscovery(newServiceEndpoint())
+            new ScalecubeServiceDiscovery()
+                .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                .options(opts -> opts.metadata(newServiceEndpoint()))
                 .options(opts -> opts.metadataCodec(metadataCodec))
                 .gossip(cfg -> GOSSIP_CONFIG)
                 .membership(cfg -> MEMBERSHIP_CONFIG)
                 .membership(cfg -> cfg.seedMembers(seedAddress)));
   }
 
   private void startSeed(MetadataCodec metadataCodec) {
-    new ScalecubeServiceDiscovery(newServiceEndpoint())
+    new ScalecubeServiceDiscovery()
+        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
         .membership(opts -> opts.seedMembers(SEED_ADDRESS))
+        .options(opts -> opts.metadata(newServiceEndpoint()))
         .options(opts -> opts.metadataCodec(metadataCodec))
         .gossip(cfg -> GOSSIP_CONFIG)
         .membership(cfg -> MEMBERSHIP_CONFIG)

diff --git a/services-examples/pom.xml b/services-examples/pom.xml
@@ -39,6 +39,10 @@
       <artifactId>scalecube-services-discovery</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-transport-netty</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>it.unimi.dsi</groupId>

diff --git a/...xamples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java b/...xamples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java
@@ -8,6 +8,7 @@
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.exceptions.UnauthorizedException;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,7 +25,12 @@ public class PrincipalMapperAuthExample {
   public static void main(String[] args) {
     Microservices service =
         Microservices.builder()
-            .discovery("service", ScalecubeServiceDiscovery::new)
+            .discovery(
+                "service",
+                serviceEndpoint ->
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(() -> new RSocketServiceTransport().authenticator(authenticator()))
             .services(
                 ServiceInfo.fromServiceInstance(new SecuredServiceByApiKeyImpl())
@@ -152,7 +158,9 @@ private static ApiKey apiKeyPrincipalMapper(Map<String, String> authData) {
 
   private static ScalecubeServiceDiscovery discovery(
       Microservices service, ServiceEndpoint endpoint) {
-    return new ScalecubeServiceDiscovery(endpoint)
+    return new ScalecubeServiceDiscovery()
+        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+        .options(opts -> opts.metadata(endpoint))
         .membership(opts -> opts.seedMembers(service.discovery("service").address()));
   }
 }
diff --git a/...amples/src/main/java/io/scalecube/services/examples/auth/ServiceTransportAuthExample.java b/...amples/src/main/java/io/scalecube/services/examples/auth/ServiceTransportAuthExample.java
@@ -7,6 +7,7 @@
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.exceptions.UnauthorizedException;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.UUID;
@@ -22,7 +23,12 @@ public class ServiceTransportAuthExample {
   public static void main(String[] args) {
     Microservices service =
         Microservices.builder()
-            .discovery("service", ScalecubeServiceDiscovery::new)
+            .discovery(
+                "service",
+                serviceEndpoint ->
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(() -> new RSocketServiceTransport().authenticator(authenticator()))
             .services(new SecuredServiceByUserProfileImpl())
             .startAwait();
@@ -71,7 +77,9 @@ private static CredentialsSupplier credsSupplier() {
 
   private static ScalecubeServiceDiscovery discovery(
       Microservices service, ServiceEndpoint endpoint) {
-    return new ScalecubeServiceDiscovery(endpoint)
+    return new ScalecubeServiceDiscovery()
+        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+        .options(opts -> opts.metadata(endpoint))
         .membership(opts -> opts.seedMembers(service.discovery("service").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
@@ -6,6 +6,7 @@
 import io.scalecube.services.examples.helloworld.service.GreetingServiceImpl;
 import io.scalecube.services.examples.helloworld.service.api.GreetingsService;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 
 public class Example1 {
 
@@ -22,7 +23,12 @@ public static void main(String[] args) {
     // ScaleCube Node node with no members
     Microservices seed =
         Microservices.builder()
-            .discovery("seed", ScalecubeServiceDiscovery::new)
+            .discovery(
+                "seed",
+                serviceEndpoint ->
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .defaultContentType(PROTOSTUFF) // set explicit default data format
             .startAwait();
@@ -35,7 +41,9 @@ public static void main(String[] args) {
             .discovery(
                 "ms",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .membership(cfg -> cfg.seedMembers(seedAddress)))
             .transport(RSocketServiceTransport::new)
             .services(new GreetingServiceImpl())

diff --git a/...les/src/main/java/io/scalecube/services/examples/discovery/CompositeDiscoveryExample.java b/...les/src/main/java/io/scalecube/services/examples/discovery/CompositeDiscoveryExample.java
@@ -9,6 +9,7 @@
 import io.scalecube.services.discovery.api.ServiceDiscoveryContext;
 import io.scalecube.services.examples.helloworld.service.api.Greeting;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import reactor.core.publisher.Mono;
 
 public class CompositeDiscoveryExample {
@@ -24,7 +25,9 @@ public static void main(String[] args) {
             .discovery(
                 "seed1",
                 serviceEndpoint ->
-                    new ScalecubeServiceDiscovery(serviceEndpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint))
                         .options(opts -> opts.memberAlias("seed1")))
             .transport(RSocketServiceTransport::new)
             .startAwait();
@@ -34,7 +37,9 @@ public static void main(String[] args) {
             .discovery(
                 "seed2",
                 serviceEndpoint ->
-                    new ScalecubeServiceDiscovery(serviceEndpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint))
                         .options(opts -> opts.memberAlias("seed2")))
             .transport(RSocketServiceTransport::new)
             .startAwait();
@@ -47,7 +52,9 @@ public static void main(String[] args) {
             .discovery(
                 "ms1",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .options(opts -> opts.memberAlias("ms1"))
                         .membership(cfg -> cfg.seedMembers(seed1Address)))
             .transport(RSocketServiceTransport::new)
@@ -59,7 +66,9 @@ public static void main(String[] args) {
             .discovery(
                 "ms2",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .options(opts -> opts.memberAlias("ms2"))
                         .membership(cfg -> cfg.seedMembers(seed2Address)))
             .transport(RSocketServiceTransport::new)
@@ -71,13 +80,17 @@ public static void main(String[] args) {
             .discovery(
                 "domain1",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .options(opts -> opts.memberAlias("domain1"))
                         .membership(cfg -> cfg.seedMembers(seed1Address)))
             .discovery(
                 "domain2",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .options(opts -> opts.memberAlias("domain2"))
                         .membership(cfg -> cfg.seedMembers(seed2Address)))
             .transport(RSocketServiceTransport::new)

diff --git a/...mples/src/main/java/io/scalecube/services/examples/exceptions/ExceptionMapperExample.java b/...mples/src/main/java/io/scalecube/services/examples/exceptions/ExceptionMapperExample.java
@@ -5,6 +5,7 @@
 import io.scalecube.services.ServiceInfo;
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import java.util.Collections;
 
 public class ExceptionMapperExample {
@@ -18,7 +19,12 @@ public class ExceptionMapperExample {
   public static void main(String[] args) throws InterruptedException {
     Microservices ms1 =
         Microservices.builder()
-            .discovery("ms1", ScalecubeServiceDiscovery::new)
+            .discovery(
+                "ms1",
+                serviceEndpoint ->
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .defaultErrorMapper(new ServiceAProviderErrorMapper()) // default mapper for whole node
             .services(
@@ -36,7 +42,9 @@ public static void main(String[] args) throws InterruptedException {
             .discovery(
                 "ms2",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .membership(cfg -> cfg.seedMembers(address1)))
             .transport(RSocketServiceTransport::new)
             .services(

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
@@ -6,6 +6,7 @@
 import io.scalecube.services.examples.helloworld.service.GreetingServiceImpl;
 import io.scalecube.services.examples.helloworld.service.api.GreetingsService;
 import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
+import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
 import reactor.core.publisher.Mono;
 
 /**
@@ -27,7 +28,12 @@ public static void main(String[] args) {
     // ScaleCube Node node with no members
     Microservices seed =
         Microservices.builder()
-            .discovery("seed", ScalecubeServiceDiscovery::new)
+            .discovery(
+                "seed",
+                serviceEndpoint ->
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(serviceEndpoint)))
             .transport(RSocketServiceTransport::new)
             .startAwait();
 
@@ -39,7 +45,9 @@ public static void main(String[] args) {
             .discovery(
                 "ms",
                 endpoint ->
-                    new ScalecubeServiceDiscovery(endpoint)
+                    new ScalecubeServiceDiscovery()
+                        .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
+                        .options(opts -> opts.metadata(endpoint))
                         .membership(cfg -> cfg.seedMembers(seedAddress)))
             .transport(RSocketServiceTransport::new)
             .services(new GreetingServiceImpl())