Merge pull request #208 from CloudNetService/installer-fix

Fix wrong ip as hostAddress on first setup

Author: einrobin

cloudnet/src/main/java/de/dytanic/cloudnet/DefaultInstallation.java

@@ -198,7 +198,7 @@ public List<String> getCompletableAnswers() {
                 if (animation.hasResult("internalHost")) {
                     HostAndPort defaultHost = (HostAndPort) animation.getResult("internalHost");
 
-                    this.cloudNet.getConfig().setDefaultHostAddress(defaultHost.getHost());
+                    this.cloudNet.getConfig().setHostAddress(defaultHost.getHost());
                     this.cloudNet.getConfig().setIdentity(new NetworkClusterNode(
                             animation.hasResult("nodeId") ? (String) animation.getResult("nodeId") : "Node-" + UUID.randomUUID().toString().split("-")[0],
                             new HostAndPort[]{defaultHost}

cloudnet/src/main/java/de/dytanic/cloudnet/conf/IConfiguration.java

@@ -18,6 +18,8 @@ public interface IConfiguration {
 
     String getHostAddress();
 
+    void setHostAddress(String hostAddress);
+
     NetworkClusterNode getIdentity();
 
     void setIdentity(NetworkClusterNode identity);

cloudnet/src/main/java/de/dytanic/cloudnet/conf/JsonConfiguration.java

@@ -26,7 +26,7 @@ public final class JsonConfiguration implements IConfiguration {
     }.getType(),
             CLUSTER = new TypeToken<NetworkCluster>() {
             }.getType(),
-            COLLECTION_STRING = new TypeToken<Collection<String>>() {
+            SET_STRING = new TypeToken<Set<String>>() {
             }.getType(),
             HOST_AND_PORT_COLLECTION = new TypeToken<Collection<HostAndPort>>() {
             }.getType();
@@ -105,7 +105,7 @@ public void load() {
             addresses.addAll(Arrays.asList(System.getenv("CLOUDNET_DEFAULT_IP_WHITELIST").split(",")));
         }
 
-        this.ipWhitelist = this.document.get("ipWhitelist", COLLECTION_STRING, addresses);
+        this.ipWhitelist = this.document.get("ipWhitelist", SET_STRING, addresses);
 
         this.clusterConfig = this.document.get("cluster", CLUSTER, new NetworkCluster(
                 System.getenv("CLOUDNET_CLUSTER_ID") != null ?
@@ -303,6 +303,11 @@ public void setHttpListeners(Collection<HostAndPort> httpListeners) {
         this.save();
     }
 
+    @Override
+    public void setHostAddress(String hostAddress) {
+        this.hostAddress = hostAddress;
+    }
+
     public ConfigurationOptionSSL getClientSslConfig() {
         return this.clientSslConfig;
     }