Updated pom with new sc-cluster/commons/reactor/parent-pom

Author: artem-v

pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-parent-pom</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2-RC3</version>
   </parent>
   <packaging>pom</packaging>
 
@@ -23,11 +23,11 @@
 
   <properties>
     <jackson.version>2.11.0</jackson.version>
-    <scalecube-cluster.version>2.6.0-RC2</scalecube-cluster.version>
-    <scalecube-commons.version>1.0.4</scalecube-commons.version>
+    <scalecube-cluster.version>2.6.0-RC3</scalecube-cluster.version>
+    <scalecube-commons.version>1.0.7</scalecube-commons.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>
+    <reactor.version>Dysprosium-SR9</reactor.version>
     <rsocket.version>1.0.1</rsocket.version>
     <protostuff.version>1.6.0</protostuff.version>
     <netty.version>4.1.50.Final</netty.version>

services-api/src/main/java/io/scalecube/services/ServiceEndpoint.java

@@ -48,6 +48,10 @@ public static Builder builder() {
     return new Builder();
   }
 
+  public static Builder from(ServiceEndpoint serviceEndpoint) {
+    return new Builder(serviceEndpoint);
+  }
+
   public String id() {
     return id;
   }
@@ -163,6 +167,14 @@ public static class Builder {
 
     private Builder() {}
 
+    private Builder(ServiceEndpoint other) {
+      this.id = other.id;
+      this.address = other.address;
+      this.contentTypes = new HashSet<>(other.contentTypes);
+      this.tags = new HashMap<>(other.tags);
+      this.serviceRegistrations = new ArrayList<>(other.serviceRegistrations);
+    }
+
     public Builder id(String id) {
       this.id = Objects.requireNonNull(id, "id");
       return this;
@@ -174,12 +186,12 @@ public Builder address(Address address) {
     }
 
     public Builder contentTypes(Set<String> contentTypes) {
-      this.contentTypes = Objects.requireNonNull(contentTypes, "contentTypes");
+      this.contentTypes = new HashSet<>(Objects.requireNonNull(contentTypes, "contentTypes"));
       return this;
     }
 
     public Builder tags(Map<String, String> tags) {
-      this.tags = Objects.requireNonNull(tags, "tags");
+      this.tags = new HashMap<>(Objects.requireNonNull(tags, "tags"));
       return this;
     }
 
@@ -204,7 +216,7 @@ public Builder appendServiceRegistrations(
      */
     public Builder serviceRegistrations(Collection<ServiceRegistration> serviceRegistrations) {
       this.serviceRegistrations =
-          Objects.requireNonNull(serviceRegistrations, "serviceRegistrations");
+          new ArrayList<>(Objects.requireNonNull(serviceRegistrations, "serviceRegistrations"));
       return this;
     }
 

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

@@ -31,6 +31,7 @@
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -143,9 +144,11 @@ public final class Microservices {
   private final MonoProcessor<Void> shutdown = MonoProcessor.create();
   private final MonoProcessor<Void> onShutdown = MonoProcessor.create();
   private ServiceEndpoint serviceEndpoint;
+  private String containerHost;
+  private Integer containerPort;
 
   private Microservices(Builder builder) {
-    this.tags = new HashMap<>(builder.tags);
+    this.tags = Collections.unmodifiableMap(new HashMap<>(builder.tags));
     this.serviceProviders = new ArrayList<>(builder.serviceProviders);
     this.serviceRegistry = builder.serviceRegistry;
     this.methodRegistry = builder.methodRegistry;
@@ -157,6 +160,8 @@ private Microservices(Builder builder) {
     this.dataDecoder = builder.dataDecoder;
     this.contentType = builder.contentType;
     this.principalMapper = builder.principalMapper;
+    this.containerHost = builder.containerHost;
+    this.containerPort = builder.containerPort;
 
     // Setup cleanup
     shutdown
@@ -217,7 +222,7 @@ private Mono<Microservices> start() {
                 LOGGER.warn("[{}] ServiceTransport is not set", this.id());
               }
 
-              serviceEndpoint = serviceEndpointBuilder.build();
+              serviceEndpoint = newServiceEndpoint(serviceEndpointBuilder.build());
 
               return createDiscovery(
                       this, new ServiceDiscoveryOptions().serviceEndpoint(serviceEndpoint))
@@ -236,6 +241,20 @@ this, new ServiceDiscoveryOptions().serviceEndpoint(serviceEndpoint))
         .doOnTerminate(scheduler::dispose);
   }
 
+  private ServiceEndpoint newServiceEndpoint(ServiceEndpoint serviceEndpoint) {
+    ServiceEndpoint.Builder builder = ServiceEndpoint.from(serviceEndpoint);
+
+    int port = Optional.ofNullable(containerPort).orElse(serviceEndpoint.address().port());
+
+    // calculate local service endpoint address
+    Address newAddress =
+        Optional.ofNullable(containerHost)
+            .map(host -> Address.create(host, port))
+            .orElseGet(() -> Address.create(serviceEndpoint.address().host(), port));
+
+    return builder.address(newAddress).build();
+  }
+
   private Mono<GatewayBootstrap> startGateway(GatewayOptions options) {
     return gatewayBootstrap.start(this, options);
   }
@@ -373,6 +392,8 @@ public static final class Builder {
             .orElse((message, dataType) -> message);
     private String contentType = ServiceMessage.DEFAULT_DATA_FORMAT;
     private PrincipalMapper<Object, Object> principalMapper = authData -> authData;
+    private String containerHost;
+    private Integer containerPort;
 
     public Mono<Microservices> start() {
       return Mono.defer(() -> new Microservices(this).start());
@@ -411,6 +432,16 @@ public Builder services(ServiceProvider serviceProvider) {
       return this;
     }
 
+    public Builder containerHost(String containerHost) {
+      this.containerHost = containerHost;
+      return this;
+    }
+
+    public Builder containerPort(Integer containerPort) {
+      this.containerPort = containerPort;
+      return this;
+    }
+
     public Builder serviceRegistry(ServiceRegistry serviceRegistry) {
       this.serviceRegistry = serviceRegistry;
       return this;