fix(datastore): add syncExpression method to configuration builder that takes the modelName as a String (#1330)

Author: richardmcclellan

aws-datastore/src/main/java/com/amplifyframework/datastore/DataStoreConfiguration.java

@@ -341,6 +341,23 @@ public Builder syncExpression(@NonNull Class<? extends Model> modelClass,
             return Builder.this;
         }
 
+        /**
+         * Sets a sync expression for a particular model to filter which data is synced locally.  The expression
+         * is evaluated each time DataStore is started.  The QueryPredicate is applied on both sync and subscriptions.
+         * @param modelName the name of the model for which the filter applies
+         * @param syncExpression DataStoreSyncExpression that should be used to filter the data that is synced.
+         * @return Current builder
+         */
+        @NonNull
+        public Builder syncExpression(@NonNull String modelName,
+                                      @NonNull DataStoreSyncExpression syncExpression) {
+            this.syncExpressions.put(
+                    Objects.requireNonNull(modelName),
+                    Objects.requireNonNull(syncExpression)
+            );
+            return Builder.this;
+        }
+
         private void populateSettingsFromJson() throws DataStoreException {
             if (pluginJson == null) {
                 return;

aws-datastore/src/test/java/com/amplifyframework/datastore/DataStoreConfigurationTest.java

@@ -17,11 +17,14 @@
 
 import androidx.annotation.NonNull;
 
+import com.amplifyframework.AmplifyException;
 import com.amplifyframework.core.Consumer;
 import com.amplifyframework.core.model.Model;
+import com.amplifyframework.core.model.ModelSchema;
 import com.amplifyframework.datastore.DataStoreConfiguration.ConfigKey;
 import com.amplifyframework.datastore.DataStoreConflictHandler.AlwaysApplyRemoteHandler;
 import com.amplifyframework.testmodels.commentsblog.BlogOwner;
+import com.amplifyframework.testmodels.commentsblog.Post;
 import com.amplifyframework.testutils.random.RandomString;
 
 import org.json.JSONException;
@@ -31,6 +34,8 @@
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
@@ -91,23 +96,27 @@ public void testDefaultOverriddenFromConfiguration() throws JSONException, DataS
      * When building a configuration from both a config file and a configuration object,
      * default values should be overridden, and the provided ones shall be used, instead.
      * @throws JSONException While arranging config file JSON
-     * @throws DataStoreException While building DataStoreConfiguration instances via build()
+     * @throws AmplifyException While building DataStoreConfiguration instances via build(), or when deriving a
+     * {@link ModelSchema} from a {@link Model} class.
      */
     @Test
-    public void testDefaultOverriddenFromConfigurationAndObject() throws JSONException, DataStoreException {
+    public void testDefaultOverriddenFromConfigurationAndObject()
+            throws JSONException, AmplifyException {
         long expectedSyncIntervalMinutes = 6L;
         Long expectedSyncIntervalMs = TimeUnit.MINUTES.toMillis(expectedSyncIntervalMinutes);
         Integer expectedSyncMaxRecords = 3;
         DummyConflictHandler dummyConflictHandler = new DummyConflictHandler();
         DataStoreErrorHandler errorHandler = DefaultDataStoreErrorHandler.instance();
 
-        DataStoreSyncExpression syncExpression = () -> BlogOwner.ID.beginsWith(RandomString.string());
+        DataStoreSyncExpression ownerSyncExpression = () -> BlogOwner.ID.beginsWith(RandomString.string());
+        DataStoreSyncExpression postSyncExpression = () -> Post.ID.beginsWith(RandomString.string());
         DataStoreConfiguration configObject = DataStoreConfiguration
             .builder()
             .syncMaxRecords(expectedSyncMaxRecords)
             .conflictHandler(dummyConflictHandler)
             .errorHandler(errorHandler)
-            .syncExpression(BlogOwner.class, syncExpression)
+            .syncExpression(BlogOwner.class, ownerSyncExpression)
+            .syncExpression("Post", postSyncExpression)
             .build();
 
         JSONObject jsonConfigFromFile = new JSONObject()
@@ -123,8 +132,11 @@ public void testDefaultOverriddenFromConfigurationAndObject() throws JSONExcepti
 
         assertEquals(dummyConflictHandler, dataStoreConfiguration.getConflictHandler());
         assertEquals(errorHandler, dataStoreConfiguration.getErrorHandler());
-        assertEquals(Collections.singletonMap(BlogOwner.class.getSimpleName(), syncExpression),
-                dataStoreConfiguration.getSyncExpressions());
+
+        Map<String, DataStoreSyncExpression> expectedSyncExpressions = new HashMap<>();
+        expectedSyncExpressions.put(BlogOwner.class.getSimpleName(), ownerSyncExpression);
+        expectedSyncExpressions.put(Post.class.getSimpleName(), postSyncExpression);
+        assertEquals(expectedSyncExpressions, dataStoreConfiguration.getSyncExpressions());
     }
 
     /**