Server options: add new cluster configuration

Author: greenrobot-team

…a/io/objectbox/sync/server/PeerInfo.java …jectbox/sync/server/ClusterPeerInfo.javaobjectbox-java/src/main/java/io/objectbox/sync/server/PeerInfo.java renamed to objectbox-java/src/main/java/io/objectbox/sync/server/ClusterPeerInfo.java objectbox-java/src/main/java/io/objectbox/sync/server/PeerInfo.java renamed to objectbox-java/src/main/java/io/objectbox/sync/server/ClusterPeerInfo.java

@@ -23,11 +23,11 @@
  * Internal class to keep configuration for a cluster peer.
  */
 @Internal
-class PeerInfo {
+class ClusterPeerInfo {
     String url;
     SyncCredentialsToken credentials;
 
-    PeerInfo(String url, SyncCredentialsToken credentials) {
+    ClusterPeerInfo(String url, SyncCredentialsToken credentials) {
         this.url = url;
         this.credentials = credentials;
     }

objectbox-java/src/main/java/io/objectbox/sync/server/SyncServerBuilder.java

@@ -39,10 +39,12 @@ public class SyncServerBuilder {
     final BoxStore boxStore;
     final String url;
     private final List<SyncCredentialsToken> credentials = new ArrayList<>();
-    final List<PeerInfo> peers = new ArrayList<>();
 
     private @Nullable String certificatePath;
     SyncChangeListener changeListener;
+    private @Nullable String clusterId;
+    private final List<ClusterPeerInfo> clusterPeers = new ArrayList<>();
+    private int clusterFlags;
 
     public SyncServerBuilder(BoxStore boxStore, String url, SyncCredentials authenticatorCredentials) {
         checkNotNull(boxStore, "BoxStore is required.");
@@ -98,21 +100,55 @@ public SyncServerBuilder changeListener(SyncChangeListener changeListener) {
     }
 
     /**
-     * Adds a server peer, to which this server should connect to as a client using {@link SyncCredentials#none()}.
+     * Enables cluster mode (requires the Cluster feature) and associates this cluster peer with the given ID.
+     * <p>
+     * Cluster peers need to share the same ID to be in the same cluster.
+     */
+    public SyncServerBuilder clusterId(String id) {
+        checkNotNull(id, "Cluster ID must not be null");
+        this.clusterId = id;
+        return this;
+    }
+
+    /**
+     * @deprecated Use {@link #clusterPeer(String, SyncCredentials) clusterPeer(url, SyncCredentials.none())} instead.
      */
+    @Deprecated
     public SyncServerBuilder peer(String url) {
-        return peer(url, SyncCredentials.none());
+        return clusterPeer(url, SyncCredentials.none());
     }
 
     /**
-     * Adds a server peer, to which this server should connect to as a client using the given credentials.
+     * @deprecated Use {@link #clusterPeer(String,SyncCredentials)} instead.
      */
+    @Deprecated
     public SyncServerBuilder peer(String url, SyncCredentials credentials) {
+        return clusterPeer(url, credentials);
+    }
+
+    /**
+     * Adds a (remote) cluster peer, to which this server should connect to as a client using the given credentials.
+     * <p>
+     * To use this, must set a {@link #clusterId(String)}.
+     */
+    public SyncServerBuilder clusterPeer(String url, SyncCredentials credentials) {
         if (!(credentials instanceof SyncCredentialsToken)) {
             throw new IllegalArgumentException("Sync credentials of type " + credentials.getType()
                     + " are not supported");
         }
-        peers.add(new PeerInfo(url, (SyncCredentialsToken) credentials));
+        clusterPeers.add(new ClusterPeerInfo(url, (SyncCredentialsToken) credentials));
+        return this;
+    }
+
+    /**
+     * Sets bit flags to configure the cluster behavior of the Sync server (aka cluster peer).
+     * <p>
+     * To use this, must set a {@link #clusterId(String)}.
+     *
+     * @param flags One or more of {@link ClusterFlags}.
+     */
+    public SyncServerBuilder clusterFlags(int flags) {
+        this.clusterFlags = flags;
         return this;
     }
 
@@ -125,6 +161,9 @@ public SyncServer build() {
         if (credentials.isEmpty()) {
             throw new IllegalStateException("At least one authenticator is required.");
         }
+        if (!clusterPeers.isEmpty() || clusterFlags != 0) {
+            checkNotNull(clusterId, "Cluster ID must be set to use cluster features.");
+        }
         return new SyncServerImpl(this);
     }
 
@@ -159,6 +198,10 @@ byte[] buildSyncServerOptions() {
         if (certificatePath != null) {
             certificatePathOffset = fbb.createString(certificatePath);
         }
+        int clusterIdOffset = 0;
+        if (clusterId != null) {
+            clusterIdOffset = fbb.createString(clusterId);
+        }
         int authenticationMethodsOffset = buildAuthenticationMethods(fbb);
         int clusterPeersVectorOffset = buildClusterPeers(fbb);
 
@@ -177,11 +220,15 @@ byte[] buildSyncServerOptions() {
 //        SyncServerOptions.addHistorySizeTargetKb();
 //        SyncServerOptions.addAdminUrl();
 //        SyncServerOptions.addAdminThreads();
-//        SyncServerOptions.addClusterId();
+        if (clusterIdOffset > 0) {
+            SyncServerOptions.addClusterId(fbb, clusterIdOffset);
+        }
         if (clusterPeersVectorOffset > 0) {
             SyncServerOptions.addClusterPeers(fbb, clusterPeersVectorOffset);
         }
-//        SyncServerOptions.addClusterFlags();
+        if (clusterFlags > 0) {
+            SyncServerOptions.addClusterFlags(fbb, clusterFlags);
+        }
         int offset = SyncServerOptions.endSyncServerOptions(fbb);
         fbb.finish(offset);
 
@@ -216,13 +263,13 @@ private int buildCredentials(FlatBufferBuilder fbb, SyncCredentialsToken tokenCr
     }
 
     private int buildClusterPeers(FlatBufferBuilder fbb) {
-        if (peers.isEmpty()) {
+        if (clusterPeers.isEmpty()) {
             return 0;
         }
 
-        int[] peersOffsets = new int[peers.size()];
-        for (int i = 0; i < peers.size(); i++) {
-            PeerInfo peer = peers.get(i);
+        int[] peersOffsets = new int[clusterPeers.size()];
+        for (int i = 0; i < clusterPeers.size(); i++) {
+            ClusterPeerInfo peer = clusterPeers.get(i);
 
             int urlOffset = fbb.createString(peer.url);
             int credentialsOffset = buildCredentials(fbb, peer.credentials);