Fixe tests

Author: artem-v

pom.xml

@@ -74,6 +74,11 @@
         <artifactId>scalecube-codec-jackson</artifactId>
         <version>${scalecube-cluster.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.scalecube</groupId>
+        <artifactId>scalecube-codec-jackson-smile</artifactId>
+        <version>${scalecube-cluster.version}</version>
+      </dependency>
 
       <!-- Scalecube Config -->
       <dependency>

services-discovery/pom.xml

@@ -38,6 +38,11 @@
       <artifactId>scalecube-codec-jackson</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-codec-jackson-smile</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

services-discovery/src/test/java/io/scalecube/services/discovery/ScalecubeServiceDiscoveryTest.java

@@ -7,6 +7,7 @@
 
 import io.scalecube.cluster.ClusterMath;
 import io.scalecube.cluster.codec.jackson.JacksonMetadataCodec;
+import io.scalecube.cluster.codec.jackson.smile.JacksonSmileMetadataCodec;
 import io.scalecube.cluster.fdetector.FailureDetectorConfig;
 import io.scalecube.cluster.gossip.GossipConfig;
 import io.scalecube.cluster.membership.MembershipConfig;
@@ -53,7 +54,9 @@ public static void setUp() {
 
   private static Stream<Arguments> metadataCodecSource() {
     return Stream.of(
-        Arguments.of(new JdkMetadataCodec()), Arguments.of(new JacksonMetadataCodec()));
+        Arguments.of(new JdkMetadataCodec()),
+        Arguments.of(new JacksonMetadataCodec()),
+        Arguments.of(new JacksonSmileMetadataCodec()));
   }
 
   @ParameterizedTest

services/pom.xml

@@ -83,6 +83,11 @@
       <artifactId>scalecube-codec-jackson</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-codec-jackson-smile</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

services/src/main/java/io/scalecube/services/Microservices.java

@@ -182,13 +182,7 @@ private Mono<Microservices> start() {
         .flatMap(
             input -> {
               final ServiceCall call = call();
-              final Address serviceAddress;
-
-              if (input != ServiceTransportBootstrap.NULL_INSTANCE) {
-                serviceAddress = input.address;
-              } else {
-                serviceAddress = null;
-              }
+              final Address serviceAddress = input.address;
 
               final ServiceEndpoint.Builder serviceEndpointBuilder =
                   ServiceEndpoint.builder()
@@ -209,13 +203,14 @@ private Mono<Microservices> start() {
                       .map(ServiceInfo::serviceInstance)
                       .collect(Collectors.toList());
 
-              final ServiceEndpoint serviceEndpoint = serviceEndpointBuilder.build();
-
-              return startGateway(call)
+              return discoveryBootstrap
+                  .createInstance(serviceEndpointBuilder.build())
+                  .publishOn(scheduler)
+                  .then(startGateway(call))
                   .publishOn(scheduler)
                   .then(Mono.fromCallable(() -> Injector.inject(this, serviceInstances)))
                   .then(Mono.fromCallable(() -> JmxMonitorMBean.start(this)))
-                  .then(discoveryBootstrap.startListen(this, serviceEndpoint))
+                  .then(discoveryBootstrap.startListen(this))
                   .publishOn(scheduler)
                   .thenReturn(this);
             })
@@ -426,28 +421,35 @@ public Builder defaultDataDecoder(ServiceMessageDataDecoder dataDecoder) {
 
   public static class ServiceDiscoveryBootstrap {
 
+    public static final Function<ServiceEndpoint, ServiceDiscovery> NULL_FACTORY = i -> null;
+
     private final Function<ServiceEndpoint, ServiceDiscovery> factory;
 
     private ServiceDiscovery discovery;
     private Disposable disposable;
 
     private ServiceDiscoveryBootstrap() {
-      this(i -> NoOpServiceDiscovery.INSTANCE);
+      this(NULL_FACTORY);
     }
 
     private ServiceDiscoveryBootstrap(Function<ServiceEndpoint, ServiceDiscovery> factory) {
       this.factory = factory;
     }
 
-    private Mono<ServiceDiscovery> startListen(
-        Microservices microservices, ServiceEndpoint serviceEndpoint) {
+    private Mono<ServiceDiscovery> createInstance(ServiceEndpoint serviceEndpoint) {
+      return factory == NULL_FACTORY
+          ? Mono.empty()
+          : Mono.defer(() -> Mono.just(discovery = factory.apply(serviceEndpoint)));
+    }
+
+    private Mono<ServiceDiscovery> startListen(Microservices microservices) {
       return Mono.defer(
           () -> {
-            discovery = factory.apply(serviceEndpoint);
             disposable =
                 discovery
                     .listenDiscovery()
                     .subscribe(event -> onDiscoveryEvent(microservices, event));
+
             return discovery
                 .start()
                 .doOnSuccess(discovery -> this.discovery = discovery)
@@ -559,13 +561,14 @@ public static class ServiceTransportBootstrap {
 
     public static final Supplier<ServiceTransport> NULL_SUPPLIER = () -> null;
     public static final ServiceTransportBootstrap NULL_INSTANCE = new ServiceTransportBootstrap();
+    public static final Address NULL_ADDRESS = Address.create("0.0.0.0", -1);
 
     private final Supplier<ServiceTransport> supplier;
 
     private ServiceTransport serviceTransport;
     private ClientTransport clientTransport;
     private ServerTransport serverTransport;
-    private Address address;
+    private Address address = NULL_ADDRESS;
 
     public ServiceTransportBootstrap() {
       this(NULL_SUPPLIER);

services/src/main/java/io/scalecube/services/NoOpServiceDiscovery.java

@@ -6,6 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.scalecube.cluster.codec.jackson.JacksonMetadataCodec;
+import io.scalecube.cluster.codec.jackson.smile.JacksonSmileMetadataCodec;
 import io.scalecube.cluster.metadata.JdkMetadataCodec;
 import io.scalecube.cluster.metadata.MetadataCodec;
 import io.scalecube.net.Address;
@@ -35,7 +36,9 @@ public class ServiceRegistryTest extends BaseTest {
 
   private static Stream<Arguments> metadataCodecSource() {
     return Stream.of(
-        Arguments.of(new JdkMetadataCodec()), Arguments.of(new JacksonMetadataCodec()));
+        Arguments.of(new JdkMetadataCodec()),
+        Arguments.of(new JacksonMetadataCodec()),
+        Arguments.of(new JacksonSmileMetadataCodec()));
   }
 
   @ParameterizedTest