Merge pull request #154 from vlingo/improvement/dynamic-cluster-nodes

Dynamic cluster nodes

Author: pflueras

src/e2e-test/java/io/vlingo/xoom/designer/codegen/e2e/java/bookstoreservice/BookData.java

@@ -6,6 +6,8 @@
 // one at https://mozilla.org/MPL/2.0/.
 package io.vlingo.xoom.designer.codegen.e2e.java.bookstoreservice;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 public class BookData {
@@ -27,15 +29,16 @@ public static BookData sampleOfChangedPrice() {
     return new BookData("", "IDDD", 987, (byte) 1, 478.25, 150, 10, true, 'a');
   }
 
-  private BookData(final String id,
-                   final String title,
-                   final int stockCode,
-                   final byte publicCode,
-                   final double price,
-                   final float weight,
-                   final long height,
-                   final boolean available,
-                   final char symbol) {
+  @JsonCreator
+  private BookData(@JsonProperty("id") final String id,
+                   @JsonProperty("title") final String title,
+                   @JsonProperty("stockCode") final int stockCode,
+                   @JsonProperty("publicCode") final byte publicCode,
+                   @JsonProperty("price") final double price,
+                   @JsonProperty("weight") final float weight,
+                   @JsonProperty("height") final long height,
+                   @JsonProperty("available") final boolean available,
+                   @JsonProperty("symbol") final char symbol) {
     this.id = id;
     this.title = title;
     this.stockCode = stockCode;

src/e2e-test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/ComponentData.java

@@ -1,5 +1,7 @@
 package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
@@ -12,7 +14,9 @@ public class ComponentData {
   public final String name;
   public final String cricalityLevel;
 
-  public ComponentData (final String name, final String cricalityLevel) {
+  @JsonCreator
+  public ComponentData (@JsonProperty("name") final String name,
+                        @JsonProperty("cricalityLevel") final String cricalityLevel) {
     this.name = name;
     this.cricalityLevel = cricalityLevel;
   }

src/e2e-test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/FreighterPartData.java

@@ -1,5 +1,7 @@
 package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
@@ -11,7 +13,9 @@ public class FreighterPartData {
   public final String partNumber;
   public final Set<ComponentData> dependentComponents = new HashSet<>();
 
-  public FreighterPartData (final String partNumber, final Set<ComponentData> dependentComponents) {
+  @JsonCreator
+  public FreighterPartData(@JsonProperty("partNumber") final String partNumber,
+                           @JsonProperty("dependentComponents") final Set<ComponentData> dependentComponents) {
     this.partNumber = partNumber;
     this.dependentComponents.addAll(dependentComponents);
   }

src/e2e-test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/MechanicalIncidentData.java

@@ -1,5 +1,7 @@
 package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
 import java.util.HashSet;
@@ -25,10 +27,11 @@ public static MechanicalIncidentData sampleOfIncidentWithRelatedPart(final Strin
     return incident;
   }
 
-  public MechanicalIncidentData (final String freighterId,
-                                 final String freighterPartNumber,
-                                 final Long occurredOn,
-                                 final Set<FreighterPartData> relatedParts) {
+  @JsonCreator
+  public MechanicalIncidentData (@JsonProperty("freighterId") final String freighterId,
+                                 @JsonProperty("freighterPartNumber") final String freighterPartNumber,
+                                 @JsonProperty("occurredOn") final Long occurredOn,
+                                 @JsonProperty("relatedParts") final Set<FreighterPartData> relatedParts) {
     this.freighterId = freighterId;
     this.freighterPartNumber = freighterPartNumber;
     this.occurredOn = occurredOn;

src/main/java/io/vlingo/xoom/designer/codegen/java/ClusterNode.java

@@ -24,12 +24,11 @@ public class ClusterNode {
 
   public static List<ClusterNode> from(final Integer startPortRange,
                                        final Integer totalNodes) {
-    final AtomicInteger resolvedStartPortRange =
-            startPortRange > 0 ? new AtomicInteger(startPortRange) :
-                    new AtomicInteger(DEFAULT_START_PORT_RANGE);
+    final AtomicInteger resolvedStartPortRange = startPortRange > 0
+            ? new AtomicInteger(startPortRange)
+            : new AtomicInteger(DEFAULT_START_PORT_RANGE);
 
-    final Integer resolvedTotalNodes =
-            (totalNodes > 0 ? totalNodes : DEFAULT_TOTAL_NODES) + 1;
+    final Integer resolvedTotalNodes = (totalNodes > 0 ? totalNodes : DEFAULT_TOTAL_NODES) + 1;
 
     return IntStream.range(1, resolvedTotalNodes)
             .mapToObj(nodeId -> new ClusterNode(nodeId, resolvedStartPortRange))

src/main/java/io/vlingo/xoom/designer/codegen/java/ClusterSettings.java

@@ -7,16 +7,9 @@
 
 package io.vlingo.xoom.designer.codegen.java;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static java.util.Collections.unmodifiableList;
-
 public class ClusterSettings {
 
-  public final String oneNode;
-  public final String nodeNames;
-  public final List<ClusterNode> nodes;
+  public final int startPortRange;
   public final int nodeCount;
   public final int quorum;
   public final int seed;
@@ -28,10 +21,8 @@ public static ClusterSettings with(final int startPortRange,
 
   private ClusterSettings(final int startPortRange,
                           final int clusterTotalNodes) {
-    this.nodes = unmodifiableList(ClusterNode.from(startPortRange, clusterTotalNodes));
-    this.nodeCount = nodes.size();
-    this.oneNode = nodes.get(0).name;
-    this.nodeNames = nodes.stream().map(node -> node.name).collect(Collectors.joining(","));
+    this.startPortRange = startPortRange;
+    this.nodeCount = clusterTotalNodes;
     this.quorum = nodeCount / 2 + 1;
     this.seed = (int)Math.round (((double) nodeCount) / 3.0d + 0.5d);
   }

src/main/java/io/vlingo/xoom/designer/infrastructure/restapi/data/DeploymentSettingsData.java

@@ -44,11 +44,12 @@ public DeploymentSettingsData(final String type,
   }
 
   public List<String> validate(List<String> errorStrings) {
-    if(type==null) errorStrings.add("DeploymentSettingsData.type is null");
-    if(type.equals(DeploymentType.DOCKER.name()) && dockerImage==null) errorStrings.add("DeploymentSettingsData.dockerImage is null");
-    if(type.equals(DeploymentType.KUBERNETES.name())) {
-      if(kubernetesImage==null) errorStrings.add("DeploymentSettingsData.kubernetesImage is null");
-      if(kubernetesPod==null) errorStrings.add("DeploymentSettingsData.kubernetesPod is null");
+    if (type == null) errorStrings.add("DeploymentSettingsData.type is null");
+    if (type.equals(DeploymentType.DOCKER.name()) && dockerImage == null)
+      errorStrings.add("DeploymentSettingsData.dockerImage is null");
+    if (type.equals(DeploymentType.KUBERNETES.name())) {
+      if (kubernetesImage == null) errorStrings.add("DeploymentSettingsData.kubernetesImage is null");
+      if (kubernetesPod == null) errorStrings.add("DeploymentSettingsData.kubernetesPod is null");
     }
     return errorStrings;
   }

src/main/resources/codegen/java/ClusterSettings.ftl

@@ -39,31 +39,11 @@ cluster.attributes.redistribution.retries = 20
 # interval at which each health check is scheduled
 cluster.health.check.interval = 2000
 
-# currently all active nodes must be listed as seed nodes
 <#if (clusterSettings.nodeCount > 1)>
-# -- comment the following to disable developer single-node cluster
-cluster.nodes = ${clusterSettings.oneNode}
-
 # -- uncomment the following to enable all cluster nodes
-# cluster.nodes = ${clusterSettings.nodeNames}
+# cluster.seeds = localhost:${clusterSettings.startPortRange?c}
 # cluster.nodes.quorum = ${clusterSettings.quorum}
 # cluster.startup.period = 5000
 <#else>
-cluster.nodes = ${clusterSettings.nodeNames}
-cluster.nodes.quorum = ${clusterSettings.quorum}
 cluster.startup.period = 5000
 </#if>
-
-################################
-# individual node configurations
-################################
-
-<#list clusterSettings.nodes as node>
-<#if (node.id > 1)>#</#if>node.${node.name}.id = ${node.id}
-<#if (node.id > 1)>#</#if>node.${node.name}.name = ${node.name}<#if (clusterSettings.seed - node.id >= 0)>
-<#if (node.id > 1)>#</#if>node.${node.name}.seed = true</#if>
-<#if (node.id > 1)>#</#if>node.${node.name}.host = localhost
-<#if (node.id > 1)>#</#if>node.${node.name}.op.port = ${node.operationalPort?c}
-<#if (node.id > 1)>#</#if>node.${node.name}.app.port = ${node.applicationPort?c}
-
-</#list>

src/main/resources/xoom-cluster.properties

@@ -47,16 +47,3 @@ cluster.attributes.redistribution.retries = 20
 
 # interval at which each health check is scheduled
 cluster.health.check.interval = 2000
-
-# currently all active nodes must be listed as seed nodes
-cluster.nodes = node1
-
-################################
-# individual node configurations
-################################
-
-node.node1.id = 1
-node.node1.name = node1
-node.node1.host = localhost
-node.node1.op.port = 49101
-node.node1.app.port = 49102

src/test/resources/text-expectations/java/custom-xoom-cluster.text

@@ -39,61 +39,7 @@ cluster.attributes.redistribution.retries = 20
 # interval at which each health check is scheduled
 cluster.health.check.interval = 2000
 
-# currently all active nodes must be listed as seed nodes
-# -- comment the following to disable developer single-node cluster
-cluster.nodes = node1
-
 # -- uncomment the following to enable all cluster nodes
-# cluster.nodes = node1,node2,node3,node4,node5,node6,node7
+# cluster.seeds = localhost:42333
 # cluster.nodes.quorum = 4
 # cluster.startup.period = 5000
-
-################################
-# individual node configurations
-################################
-
-node.node1.id = 1
-node.node1.name = node1
-node.node1.seed = true
-node.node1.host = localhost
-node.node1.op.port = 42333
-node.node1.app.port = 42334
-
-#node.node2.id = 2
-#node.node2.name = node2
-#node.node2.seed = true
-#node.node2.host = localhost
-#node.node2.op.port = 42335
-#node.node2.app.port = 42336
-
-#node.node3.id = 3
-#node.node3.name = node3
-#node.node3.seed = true
-#node.node3.host = localhost
-#node.node3.op.port = 42337
-#node.node3.app.port = 42338
-
-#node.node4.id = 4
-#node.node4.name = node4
-#node.node4.host = localhost
-#node.node4.op.port = 42339
-#node.node4.app.port = 42340
-
-#node.node5.id = 5
-#node.node5.name = node5
-#node.node5.host = localhost
-#node.node5.op.port = 42341
-#node.node5.app.port = 42342
-
-#node.node6.id = 6
-#node.node6.name = node6
-#node.node6.host = localhost
-#node.node6.op.port = 42343
-#node.node6.app.port = 42344
-
-#node.node7.id = 7
-#node.node7.name = node7
-#node.node7.host = localhost
-#node.node7.op.port = 42345
-#node.node7.app.port = 42346
-