Observe query

aws-api/src/main/java/com/amplifyframework/api/aws/AWSApiPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/storage/SynchronousStorageAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -18,14 +18,19 @@
 import android.content.Context;
 import androidx.annotation.NonNull;
 
+import com.amplifyframework.core.Action;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.async.Cancelable;
 import com.amplifyframework.core.model.Model;
 import com.amplifyframework.core.model.ModelSchema;
+import com.amplifyframework.core.model.query.ObserveQueryOptions;
 import com.amplifyframework.core.model.query.QueryOptions;
 import com.amplifyframework.core.model.query.Where;
 import com.amplifyframework.core.model.query.predicate.QueryPredicate;
 import com.amplifyframework.core.model.query.predicate.QueryPredicates;
+import com.amplifyframework.datastore.DataStoreConfiguration;
 import com.amplifyframework.datastore.DataStoreException;
+import com.amplifyframework.datastore.DataStoreQuerySnapshot;
 import com.amplifyframework.testutils.Await;
 import com.amplifyframework.testutils.VoidResult;
 
@@ -93,8 +98,20 @@ public static SynchronousStorageAdapter create(
     public List<ModelSchema> initialize(@NonNull Context context) throws DataStoreException {
         return Await.result(
             operationTimeoutMs,
-            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) ->
-                asyncDelegate.initialize(context, onResult, onError)
+            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) -> {
+                try {
+                    asyncDelegate.initialize(context,
+                            onResult,
+                            onError,
+                            DataStoreConfiguration.builder()
+                                    .syncInterval(2L, TimeUnit.MINUTES)
+                                    .observeQueryMaxRecords(2)
+                                    .observeQueryMaxTime(0)
+                                    .build());
+                } catch (DataStoreException exception) {
+                    onError.accept(exception);
+                }
+            }
         );
     }
 
@@ -206,6 +223,31 @@ public <T extends Model> List<T> query(@NonNull Class<T> modelClass, @NonNull Qu
         return resultSet;
     }
 
+    /**
+     * Query the storage adapter for models of a given class, and considering some additional criteria
+     * that each model must meet.
+     * @param modelClass Class of models being queried
+     * @param options Query options with predicate and pagination info
+     * @param <T> Type of model being queried
+     * @param onObservationStarted callback for canceling the subscription
+     * @param onQuerySnapshot callback for DataStoreQuerySnapshot
+     * @param onObservationError callback for DataStoreException
+     * @param onObservationComplete callback for onObservationComplete
+     */
+    public <T extends Model> void observeQuery(@NonNull Class<T> modelClass,
+                                               @NonNull ObserveQueryOptions options,
+                                               @NonNull Consumer<Cancelable> onObservationStarted,
+                                               @NonNull Consumer<DataStoreQuerySnapshot<T>> onQuerySnapshot,
+                                               @NonNull Consumer<DataStoreException> onObservationError,
+                                               @NonNull Action onObservationComplete) {
+        asyncDelegate.observeQuery(modelClass,
+                options,
+                onObservationStarted,
+                onQuerySnapshot,
+                onObservationError,
+                onObservationComplete);
+    }
+
     /**
      * Delete a model, unconditionally. Expect success.
      * @param model A model to be deleted

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/storage/sqlite/ModelUpgradeSQLiteInstrumentedTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -19,9 +19,11 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import com.amplifyframework.AmplifyException;
+import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
 import com.amplifyframework.core.model.ModelSchema;
 import com.amplifyframework.core.model.SchemaRegistry;
+import com.amplifyframework.datastore.DataStoreConfiguration;
 import com.amplifyframework.datastore.DataStoreException;
 import com.amplifyframework.datastore.StrictMode;
 import com.amplifyframework.datastore.model.CompoundModelProvider;
@@ -105,8 +107,16 @@ public void modelVersionStoredCorrectlyBeforeAndAfterUpgrade() throws AmplifyExc
         sqliteStorageAdapter = SQLiteStorageAdapter.forModels(schemaRegistry, modelProvider);
         List<ModelSchema> firstResults = Await.result(
             SQLITE_OPERATION_TIMEOUT_MS,
-            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) ->
-                sqliteStorageAdapter.initialize(context, onResult, onError)
+            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) -> {
+                try {
+                    sqliteStorageAdapter.initialize(context, onResult, onError,
+                            DataStoreConfiguration.builder()
+                                    .syncInterval(2L, TimeUnit.MINUTES)
+                                    .build());
+                } catch (DataStoreException exception) {
+                    Amplify.Logging.forNamespace("amplify:aws-datastore").warn(exception.toString());
+                }
+            }
         );
         // Assert if initialize succeeds.
         assertFalse(Empty.check(firstResults));
@@ -135,8 +145,16 @@ public void modelVersionStoredCorrectlyBeforeAndAfterUpgrade() throws AmplifyExc
         // Now, initialize storage adapter with the new models
         List<ModelSchema> secondResults = Await.result(
             SQLITE_OPERATION_TIMEOUT_MS,
-            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) ->
-                sqliteStorageAdapter.initialize(context, onResult, onError)
+            (Consumer<List<ModelSchema>> onResult, Consumer<DataStoreException> onError) -> {
+                try {
+                    sqliteStorageAdapter.initialize(context, onResult, onError,
+                            DataStoreConfiguration.builder()
+                            .syncInterval(2L, TimeUnit.MINUTES)
+                            .build());
+                } catch (DataStoreException exception) {
+                    Amplify.Logging.forNamespace("amplify:aws-datastore").warn(exception.toString());
+                }
+            }
         );
         assertFalse(Empty.check(secondResults));