Sync Hybrid: fix access issues, validate required values in builder

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/sync/Sync.java

@@ -18,7 +18,6 @@
 
 import io.objectbox.BoxStore;
 import io.objectbox.BoxStoreBuilder;
-import io.objectbox.sync.server.SyncHybridBuilder;
 import io.objectbox.sync.server.SyncServer;
 import io.objectbox.sync.server.SyncServerBuilder;
 

objectbox-java/src/main/java/io/objectbox/sync/SyncBuilder.java

@@ -97,17 +97,18 @@ public SyncBuilder(BoxStore boxStore, SyncCredentials credentials) {
         this.credentials = credentials;
     }
 
+    @Internal
     public SyncBuilder(BoxStore boxStore, String url, SyncCredentials credentials) {
         this(boxStore, credentials);
         checkNotNull(url, "Sync server URL is required.");
         this.url = url;
     }
 
     /**
-     * Internal URL setter for late assignment (used by {@link io.objectbox.sync.server.SyncHybridBuilder}).
+     * Allows internal code to set the Sync server URL after creating this builder.
      */
     @Internal
-    public SyncBuilder lateUrl(String url) {
+    SyncBuilder serverUrl(String url) {
         this.url = url;
         return this;
     }
@@ -220,6 +221,7 @@ public SyncClient build() {
         if (boxStore.getSyncClient() != null) {
             throw new IllegalStateException("The given store is already associated with a Sync client, close it first.");
         }
+        checkNotNull(url, "Sync Server URL is required.");
         return new SyncClientImpl(this);
     }
 

objectbox-java/src/main/java/io/objectbox/sync/SyncClientImpl.java

@@ -60,10 +60,6 @@ public class SyncClientImpl implements SyncClient {
     private volatile boolean started;
 
     SyncClientImpl(SyncBuilder builder) {
-        if (builder.url == null) {
-            throw new IllegalArgumentException("Sync client destination URL was not specified");
-        }
-
         this.boxStore = builder.boxStore;
         this.serverUrl = builder.url;
         this.connectivityMonitor = builder.platform.getConnectivityMonitor();

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentials.java

@@ -92,6 +92,6 @@ public long getTypeId() {
      * This can be useful to use the same credentials when creating multiple clients or a server in combination with a
      * client as some credentials may get cleared when building a client or server.
      */
-    public abstract SyncCredentials createClone();
+    abstract SyncCredentials createClone();
 
 }

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentialsToken.java

@@ -75,7 +75,7 @@ public void clear() {
     }
 
     @Override
-    public SyncCredentialsToken createClone() {
+    SyncCredentialsToken createClone() {
         if (cleared) {
             throw new IllegalStateException("Cannot clone: credentials already have been cleared");
         }

objectbox-java/src/main/java/io/objectbox/sync/SyncCredentialsUserPassword.java

@@ -43,7 +43,7 @@ public String getPassword() {
     }
 
     @Override
-    public SyncCredentials createClone() {
+    SyncCredentials createClone() {
         return new SyncCredentialsUserPassword(this.username, this.password);
     }
 }

objectbox-java/src/main/java/io/objectbox/sync/server/SyncHybrid.java renamed to objectbox-java/src/main/java/io/objectbox/sync/SyncHybrid.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.objectbox.sync.server;
+package io.objectbox.sync;
 
 import java.io.Closeable;
 
 import io.objectbox.BoxStore;
-import io.objectbox.sync.SyncClient;
+import io.objectbox.sync.server.SyncServer;
 
 /**
  * The SyncHybrid combines the functionality of a Sync Client and a Sync Server.
@@ -36,7 +36,7 @@ public final class SyncHybrid implements Closeable {
     private BoxStore storeServer;
     private final SyncServer server;
 
-    public SyncHybrid(BoxStore store, SyncClient client, BoxStore storeServer, SyncServer server) {
+    SyncHybrid(BoxStore store, SyncClient client, BoxStore storeServer, SyncServer server) {
         this.store = store;
         this.client = client;
         this.storeServer = storeServer;

objectbox-java/src/main/java/io/objectbox/sync/server/SyncHybridBuilder.java renamed to objectbox-java/src/main/java/io/objectbox/sync/SyncHybridBuilder.java

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package io.objectbox.sync.server;
+package io.objectbox.sync;
 
 import io.objectbox.BoxStore;
 import io.objectbox.BoxStoreBuilder;
 import io.objectbox.InternalAccess;
 import io.objectbox.annotation.apihint.Internal;
-import io.objectbox.sync.Sync;
-import io.objectbox.sync.SyncBuilder;
-import io.objectbox.sync.SyncClient;
-import io.objectbox.sync.SyncCredentials;
+import io.objectbox.sync.server.SyncServer;
+import io.objectbox.sync.server.SyncServerBuilder;
 
 /**
  * Allows to configure the client and server setup to build a {@link SyncHybrid}.
@@ -42,7 +40,7 @@ public final class SyncHybridBuilder {
      * Internal API; use {@link Sync#hybrid(BoxStoreBuilder, String, SyncCredentials)} instead.
      */
     @Internal
-    public SyncHybridBuilder(BoxStoreBuilder storeBuilder, String url, SyncCredentials authenticatorCredentials) {
+    SyncHybridBuilder(BoxStoreBuilder storeBuilder, String url, SyncCredentials authenticatorCredentials) {
         BoxStoreBuilder storeBuilderServer = InternalAccess.clone(storeBuilder, "-server");
         boxStore = storeBuilder.build();
         boxStoreServer = storeBuilderServer.build();
@@ -74,8 +72,9 @@ public SyncHybrid buildAndStart() {
         // Build and start the server first, we may need to get a  port for the client
         SyncServer server = serverBuilder.buildAndStart();
 
-        clientBuilder.lateUrl(server.getUrl());
-        SyncClient client = clientBuilder.buildAndStart();
+        SyncClient client = clientBuilder
+                .serverUrl(server.getUrl())
+                .buildAndStart();
 
         return new SyncHybrid(boxStore, client, boxStoreServer, server);
     }

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

@@ -24,6 +24,7 @@
 import javax.annotation.Nullable;
 
 import io.objectbox.BoxStore;
+import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.flatbuffers.FlatBufferBuilder;
 import io.objectbox.sync.Credentials;
 import io.objectbox.sync.Sync;
@@ -56,6 +57,7 @@ public class SyncServerBuilder {
     /**
      * Use {@link Sync#server(BoxStore, String, SyncCredentials)} instead.
      */
+    @Internal
     public SyncServerBuilder(BoxStore boxStore, String url, SyncCredentials authenticatorCredentials) {
         checkNotNull(boxStore, "BoxStore is required.");
         checkNotNull(url, "Sync server URL is required.");