Merge pull request #345 from scalecube/change-container-name-and-port-names

Renamed containerHost->externalHost, containerPort->externalPort

Author: artem-v

cluster-api/src/main/java/io/scalecube/cluster/ClusterConfig.java

@@ -35,8 +35,8 @@ public final class ClusterConfig implements Cloneable {
   private MetadataCodec metadataCodec = MetadataCodec.INSTANCE;
 
   private String memberAlias;
-  private String containerHost;
-  private Integer containerPort;
+  private String externalHost;
+  private Integer externalPort;
 
   private TransportConfig transportConfig = TransportConfig.defaultConfig();
   private FailureDetectorConfig failureDetectorConfig = FailureDetectorConfig.defaultConfig();
@@ -147,27 +147,27 @@ public ClusterConfig metadataCodec(MetadataCodec metadataCodec) {
   }
 
   /**
-   * Returns mappedHost. {@code mappedHost} is a config property for container environments, it's
-   * being set for advertising to scalecube cluster some connectable hostname which maps to
+   * Returns externalHost. {@code externalHost} is a config property for container environments,
+   * it's being set for advertising to scalecube cluster some connectable hostname which maps to
    * scalecube transport's hostname on which scalecube transport is listening.
    *
-   * @return mapped host
+   * @return external host
    */
-  public String containerHost() {
-    return containerHost;
+  public String externalHost() {
+    return externalHost;
   }
 
   /**
-   * Setter for mappedHost. {@code mappedHost} is a config property for container environments, it's
-   * being set for advertising to scalecube cluster some connectable hostname which maps to
+   * Setter for externalHost. {@code externalHost} is a config property for container environments,
+   * it's being set for advertising to scalecube cluster some connectable hostname which maps to
    * scalecube transport's hostname on which scalecube transport is listening.
    *
-   * @param mappedHost mapped host
+   * @param externalHost external host
    * @return new {@code ClusterConfig} instance
    */
-  public ClusterConfig containerHost(String mappedHost) {
+  public ClusterConfig externalHost(String externalHost) {
     ClusterConfig c = clone();
-    c.containerHost = mappedHost;
+    c.externalHost = externalHost;
     return c;
   }
 
@@ -195,27 +195,27 @@ public ClusterConfig memberAlias(String memberAlias) {
   }
 
   /**
-   * Returns mappedPort. {@code mappedPort} is a config property for container environments, it's
-   * being set for advertising to scalecube cluster a port which mapped to scalecube transport's
-   * listening port.
+   * Returns externalPort. {@code externalPort} is a config property for container environments,
+   * it's being set for advertising to scalecube cluster a port which mapped to scalecube
+   * transport's listening port.
    *
-   * @return mapped port
+   * @return external port
    */
-  public Integer containerPort() {
-    return containerPort;
+  public Integer externalPort() {
+    return externalPort;
   }
 
   /**
-   * Setter for mappedPort. {@code mappedPort} is a config property for container environments, it's
-   * being set for advertising to scalecube cluster a port which mapped to scalecube transport's
-   * listening port.
+   * Setter for externalPort. {@code externalPort} is a config property for container environments,
+   * it's being set for advertising to scalecube cluster a port which mapped to scalecube
+   * transport's listening port.
    *
-   * @param mappedPort mapped port
+   * @param externalPort external port
    * @return new {@code ClusterConfig} instance
    */
-  public ClusterConfig containerPort(Integer mappedPort) {
+  public ClusterConfig externalPort(Integer externalPort) {
     ClusterConfig c = clone();
-    c.containerPort = mappedPort;
+    c.externalPort = externalPort;
     return c;
   }
 
@@ -304,8 +304,8 @@ public String toString() {
         .add("metadataTimeout=" + metadataTimeout)
         .add("metadataCodec=" + metadataCodec)
         .add("memberAlias='" + memberAlias + "'")
-        .add("containerHost='" + containerHost + "'")
-        .add("containerPort=" + containerPort)
+        .add("externalHost='" + externalHost + "'")
+        .add("externalPort=" + externalPort)
         .add("transportConfig=" + transportConfig)
         .add("failureDetectorConfig=" + failureDetectorConfig)
         .add("gossipConfig=" + gossipConfig)

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

@@ -384,11 +384,11 @@ private Flux<MembershipEvent> listenMembership() {
    * @return local cluster member with cluster address and cluster member id
    */
   private Member createLocalMember(Address address) {
-    int port = Optional.ofNullable(config.containerPort()).orElse(address.port());
+    int port = Optional.ofNullable(config.externalPort()).orElse(address.port());
 
     // calculate local member cluster address
     Address memberAddress =
-        Optional.ofNullable(config.containerHost())
+        Optional.ofNullable(config.externalHost())
             .map(host -> Address.create(host, port))
             .orElseGet(() -> Address.create(address.host(), port));
 

cluster/src/test/java/io/scalecube/cluster/ClusterTest.java

@@ -138,7 +138,7 @@ public void testJoinLocalhostIgnoredWithOverride() throws InterruptedException {
 
     // Start seed node
     Cluster seedNode =
-        new ClusterImpl(new ClusterConfig().containerHost("localhost").containerPort(7878))
+        new ClusterImpl(new ClusterConfig().externalHost("localhost").externalPort(7878))
             .transport(opts -> opts.port(7878).connectTimeout(CONNECT_TIMEOUT))
             .membership(opts -> opts.seedMembers(addresses))
             .startAwait();

cluster/src/test/java/io/scalecube/cluster/membership/MembershipProtocolTest.java

@@ -753,19 +753,19 @@ public void testOverrideMemberAddress() throws UnknownHostException {
     NetworkEmulatorTransport e = createTransport();
 
     MembershipProtocolImpl cmA =
-        createMembership(a, testConfig(Collections.emptyList()).containerHost(localAddress));
+        createMembership(a, testConfig(Collections.emptyList()).externalHost(localAddress));
     MembershipProtocolImpl cmB =
         createMembership(
-            b, testConfig(Collections.singletonList(a.address())).containerHost(localAddress));
+            b, testConfig(Collections.singletonList(a.address())).externalHost(localAddress));
     MembershipProtocolImpl cmC =
         createMembership(
-            c, testConfig(Collections.singletonList(a.address())).containerHost(localAddress));
+            c, testConfig(Collections.singletonList(a.address())).externalHost(localAddress));
     MembershipProtocolImpl cmD =
         createMembership(
-            d, testConfig(Collections.singletonList(b.address())).containerHost(localAddress));
+            d, testConfig(Collections.singletonList(b.address())).externalHost(localAddress));
     MembershipProtocolImpl cmE =
         createMembership(
-            e, testConfig(Collections.singletonList(b.address())).containerHost(localAddress));
+            e, testConfig(Collections.singletonList(b.address())).externalHost(localAddress));
 
     try {
       awaitSeconds(3);