Simplify cluster configuration.

agent/src/test/resources/atomix.yaml

@@ -2,17 +2,16 @@ data-directory: target/test-logs/
 # Cluster configuration
 cluster:
   name: test
-  core:
-    nodes:
-      - id: node1
-        type: core
-        address: localhost:5000
-      - id: node2
-        type: core
-        address: localhost:5001
-      - id: node3
-        type: core
-        address: localhost:5002
+  nodes:
+    - id: node1
+      type: core
+      address: localhost:5000
+    - id: node2
+      type: core
+      address: localhost:5001
+    - id: node3
+      type: core
+      address: localhost:5002
 # A list of partition groups
 partition-groups:
   - type: raft

cluster/src/main/java/io/atomix/cluster/ClusterConfig.java

@@ -16,17 +16,33 @@
 package io.atomix.cluster;
 
 import io.atomix.utils.Config;
+import io.atomix.utils.net.Address;
+import io.atomix.utils.net.MalformedAddressException;
+
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * Cluster configuration.
  */
 public class ClusterConfig implements Config {
   private static final String DEFAULT_CLUSTER_NAME = "atomix";
+  private static final String DEFAULT_MULTICAST_IP = "230.0.0.1";
+  private static final int DEFAULT_MULTICAST_PORT = 54321;
 
   private String name = DEFAULT_CLUSTER_NAME;
   private NodeConfig localNode;
-  private CoreConfig core = new CoreConfig();
-  private BootstrapConfig bootstrap = new BootstrapConfig();
+  private Collection<NodeConfig> nodes = new ArrayList<>();
+  private boolean multicastEnabled = false;
+  private Address multicastAddress;
+
+  public ClusterConfig() {
+    try {
+      multicastAddress = Address.from(DEFAULT_MULTICAST_IP, DEFAULT_MULTICAST_PORT);
+    } catch (MalformedAddressException e) {
+      multicastAddress = Address.from(DEFAULT_MULTICAST_PORT);
+    }
+  }
 
   /**
    * Returns the cluster name.
@@ -69,42 +85,62 @@ public ClusterConfig setLocalNode(NodeConfig localNode) {
   }
 
   /**
-   * Returns the core configuration.
+   * Returns the cluster nodes.
+   *
+   * @return the cluster nodes
+   */
+  public Collection<NodeConfig> getNodes() {
+    return nodes;
+  }
+
+  /**
+   * Sets the cluster nodes.
+   *
+   * @param nodes the cluster nodes
+   * @return the cluster configuration
+   */
+  public ClusterConfig setNodes(Collection<NodeConfig> nodes) {
+    this.nodes = nodes;
+    return this;
+  }
+
+  /**
+   * Returns whether multicast is enabled.
    *
-   * @return the core configuration.
+   * @return whether multicast is enabled
    */
-  public CoreConfig getCoreConfig() {
-    return core;
+  public boolean isMulticastEnabled() {
+    return multicastEnabled;
   }
 
   /**
-   * Sets the core configuration.
+   * Sets whether multicast is enabled.
    *
-   * @param core the core configuration
+   * @param multicastEnabled whether multicast is enabled
    * @return the cluster configuration
    */
-  public ClusterConfig setCoreConfig(CoreConfig core) {
-    this.core = core;
+  public ClusterConfig setMulticastEnabled(boolean multicastEnabled) {
+    this.multicastEnabled = multicastEnabled;
     return this;
   }
 
   /**
-   * Returns the bootstrap configuration.
+   * Returns the multicast address.
    *
-   * @return the bootstrap configuration.
+   * @return the multicast address
    */
-  public BootstrapConfig getBootstrapConfig() {
-    return bootstrap;
+  public Address getMulticastAddress() {
+    return multicastAddress;
   }
 
   /**
-   * Sets the bootstrap configuration.
+   * Sets the multicast address.
    *
-   * @param bootstrap the bootstrap configuration
+   * @param multicastAddress the multicast address
    * @return the cluster configuration
    */
-  public ClusterConfig setBootstrapConfig(BootstrapConfig bootstrap) {
-    this.bootstrap = bootstrap;
+  public ClusterConfig setMulticastAddress(Address multicastAddress) {
+    this.multicastAddress = multicastAddress;
     return this;
   }
 }

cluster/src/main/java/io/atomix/cluster/impl/DefaultBootstrapMetadataService.java

@@ -15,16 +15,13 @@
  */
 package io.atomix.cluster.impl;
 
-import io.atomix.cluster.BootstrapConfig;
 import io.atomix.cluster.ClusterMetadata;
 import io.atomix.cluster.ClusterMetadataEventListener;
 import io.atomix.cluster.ClusterMetadataService;
 import io.atomix.cluster.ManagedBootstrapMetadataService;
-import io.atomix.cluster.Node;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
@@ -35,10 +32,6 @@ public class DefaultBootstrapMetadataService implements ManagedBootstrapMetadata
   private final ClusterMetadata metadata;
   private final AtomicBoolean started = new AtomicBoolean();
 
-  public DefaultBootstrapMetadataService(BootstrapConfig config) {
-    this(new ClusterMetadata(config.getNodes().stream().map(Node::new).collect(Collectors.toList())));
-  }
-
   public DefaultBootstrapMetadataService(ClusterMetadata metadata) {
     this.metadata = metadata;
   }

cluster/src/main/java/io/atomix/cluster/impl/DefaultCoreMetadataService.java

@@ -25,7 +25,6 @@
 import io.atomix.cluster.ClusterMetadataEvent;
 import io.atomix.cluster.ClusterMetadataEventListener;
 import io.atomix.cluster.ClusterMetadataService;
-import io.atomix.cluster.CoreConfig;
 import io.atomix.cluster.ManagedCoreMetadataService;
 import io.atomix.cluster.Node;
 import io.atomix.cluster.NodeId;
@@ -97,10 +96,6 @@ public class DefaultCoreMetadataService
       namedThreads("atomix-cluster-metadata-receiver", log));
   private ScheduledFuture<?> metadataFuture;
 
-  public DefaultCoreMetadataService(CoreConfig config, MessagingService messagingService) {
-    this(ClusterMetadata.builder().withNodes(config.getNodes().stream().map(Node::new).collect(Collectors.toList())).build(), messagingService);
-  }
-
   public DefaultCoreMetadataService(ClusterMetadata metadata, MessagingService messagingService) {
     metadata.nodes().forEach(node -> nodes.put(node.id(), new ReplicatedNode(
         node.id(),

config/src/test/resources/config.json

@@ -7,6 +7,7 @@
   ],
   "primitives": {
     "foo": {
+      "type": "consistent-map",
       "serializer": {
         "types": [
           {

config/src/test/resources/config.yaml

@@ -4,6 +4,7 @@ primitive-types:
   - io.atomix.core.map.ConsistentMapType
 primitives:
   foo:
+    type: consistent-map
     serializer:
       types:
         - type: io.atomix.cluster.NodeId