1.2.0 last minute change: passing DataSubscriptionList

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/query/Query.java

@@ -17,6 +17,7 @@
 import io.objectbox.annotation.apihint.Beta;
 import io.objectbox.internal.CallWithHandle;
 import io.objectbox.reactive.DataObserver;
+import io.objectbox.reactive.DataSubscriptionList;
 import io.objectbox.reactive.SubscriptionBuilder;
 import io.objectbox.relation.RelationInfo;
 import io.objectbox.relation.ToOne;
@@ -499,6 +500,18 @@ public SubscriptionBuilder<List<T>> subscribe() {
         return new SubscriptionBuilder<>(publisher, null, box.getStore().internalThreadPool());
     }
 
+    /**
+     * Convenience for {@link #subscribe()} with a subsequent call to
+     * {@link SubscriptionBuilder#dataSubscriptionList(DataSubscriptionList)}.
+     *
+     * @param dataSubscriptionList the resulting {@link io.objectbox.reactive.DataSubscription} will be added to it
+     */
+    public SubscriptionBuilder<List<T>> subscribe(DataSubscriptionList dataSubscriptionList) {
+        SubscriptionBuilder<List<T>> subscriptionBuilder = subscribe();
+        subscriptionBuilder.dataSubscriptionList(dataSubscriptionList);
+        return subscriptionBuilder;
+    }
+
     /**
      * Publishes the current data to all subscribed @{@link DataObserver}s.
      * This is useful triggering observers when new parameters have been set.

objectbox-java/src/main/java/io/objectbox/reactive/SubscriptionBuilder.java

@@ -38,6 +38,7 @@ public class SubscriptionBuilder<T> {
     private DataTransformer<T, Object> transformer;
     private Scheduler scheduler;
     private ErrorObserver errorObserver;
+    private DataSubscriptionList dataSubscriptionList;
     //    private boolean sync;
 
 
@@ -144,6 +145,10 @@ public DataSubscription observer(DataObserver<T> observer) {
             weakObserver.setSubscription(subscription);
         }
 
+        if(dataSubscriptionList != null) {
+            dataSubscriptionList.add(subscription);
+        }
+
         // TODO FIXME when an observer subscribes twice, it currently won't be added, but we return a new subscription
 
         // Trivial observers do not have to be wrapped
@@ -165,15 +170,9 @@ public DataSubscription observer(DataObserver<T> observer) {
         return subscription;
     }
 
-    /**
-     * Convenience for calling {@link #observer(DataObserver)} with adding the resulting {@link DataSubscription} to the
-     * given {@link DataSubscriptionList}.
-     */
-    @Beta
-    public DataSubscription observer(DataObserver<T> observer, DataSubscriptionList dataSubscriptionList) {
-        DataSubscription dataSubscription = observer(observer);
-        dataSubscriptionList.add(dataSubscription);
-        return dataSubscription;
+    public SubscriptionBuilder<T> dataSubscriptionList(DataSubscriptionList dataSubscriptionList) {
+        this.dataSubscriptionList = dataSubscriptionList;
+        return this;
     }
 
     class ActionObserver implements DataObserver<T>, DelegatingObserver<T> {