Replace adapter constructors with options (#7)

Author: samtstern

app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

@@ -15,6 +15,7 @@
 import android.widget.Toast;
 
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
+import com.firebase.ui.firestore.FirestoreRecyclerOptions;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -68,7 +69,12 @@ protected void onCreate(Bundle savedInstanceState) {
         Query query = mFirestore.collection("chats").orderBy("timestamp").limit(50);
 
         LinearLayoutManager manager = new LinearLayoutManager(this);
-        mAdapter = new FirestoreRecyclerAdapter<Chat, ChatHolder>(query, Chat.class) {
+
+        FirestoreRecyclerOptions<Chat> options = new FirestoreRecyclerOptions.Builder<Chat>()
+                .setQuery(query, Chat.class)
+                .build();
+
+        mAdapter = new FirestoreRecyclerAdapter<Chat, ChatHolder>(options) {
             @Override
             public void onBindViewHolder(ChatHolder holder, int position, Chat model) {
                 holder.bind(model);

app/src/main/java/com/firebase/uidemo/database/realtime/ChatActivity.java

@@ -29,6 +29,7 @@
 import android.widget.Toast;
 
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.firebase.ui.database.FirebaseRecyclerOptions;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
 import com.firebase.uidemo.util.SignInResultNotifier;
@@ -140,12 +141,16 @@ public void onItemRangeInserted(int positionStart, int itemCount) {
 
     protected FirebaseRecyclerAdapter<Chat, ChatHolder> getAdapter() {
         Query lastFifty = mChatRef.limitToLast(50);
-        return new FirebaseRecyclerAdapter<Chat, ChatHolder>(
-                Chat.class,
-                R.layout.message,
-                ChatHolder.class,
-                lastFifty,
-                this) {
+
+        FirebaseRecyclerOptions<Chat, ChatHolder> options =
+                new FirebaseRecyclerOptions.Builder<Chat, ChatHolder>()
+                        .setViewHolder(R.layout.message, ChatHolder.class)
+                        .setQuery(lastFifty, Chat.class)
+                        .setLifecycleOwner(this)
+                        .build();
+
+        return new FirebaseRecyclerAdapter<Chat, ChatHolder>(options) {
+
             @Override
             public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
                 holder.bind(chat);

app/src/main/java/com/firebase/uidemo/database/realtime/ChatIndexActivity.java

@@ -2,8 +2,8 @@
 
 import android.view.View;
 
-import com.firebase.ui.database.FirebaseIndexRecyclerAdapter;
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.firebase.ui.database.FirebaseRecyclerOptions;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
 import com.google.firebase.auth.FirebaseAuth;
@@ -33,13 +33,14 @@ protected FirebaseRecyclerAdapter<Chat, ChatHolder> getAdapter() {
                 .child("chatIndices")
                 .child(FirebaseAuth.getInstance().getCurrentUser().getUid());
 
-        return new FirebaseIndexRecyclerAdapter<Chat, ChatHolder>(
-                Chat.class,
-                R.layout.message,
-                ChatHolder.class,
-                mChatIndicesRef.limitToLast(50),
-                mChatRef,
-                this) {
+        FirebaseRecyclerOptions<Chat, ChatHolder> options =
+                new FirebaseRecyclerOptions.Builder<Chat, ChatHolder>()
+                        .setIndexedQuery(mChatIndicesRef.limitToFirst(50), mChatRef, Chat.class)
+                        .setViewHolder(R.layout.message, ChatHolder.class)
+                        .setLifecycleOwner(this)
+                        .build();
+
+        return new FirebaseRecyclerAdapter<Chat, ChatHolder>(options) {
             @Override
             public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
                 holder.bind(chat);

common/src/main/java/com/firebase/ui/common/Preconditions.java

@@ -7,8 +7,21 @@
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class Preconditions {
+
     public static <T> T checkNotNull(T o) {
         if (o == null) throw new IllegalArgumentException("Argument cannot be null.");
         return o;
     }
+
+    public static void assertNull(Object object, String message) {
+        if (object != null) {
+            throw new RuntimeException(message);
+        }
+    }
+
+    public static void assertNonNull(Object object, String message) {
+        if (object == null) {
+            throw new RuntimeException(message);
+        }
+    }
 }

database/build.gradle

@@ -25,6 +25,9 @@ android {
 dependencies {
     compile project(path: ':common')
     compile "com.google.firebase:firebase-database:$firebaseVersion"
+
+    compile "android.arch.lifecycle:runtime:$architectureVersion"
+    compile "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
 
     androidTestCompile 'junit:junit:4.12'

database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java

@@ -46,7 +46,7 @@ public void setUp() throws Exception {
                 .getReference()
                 .child("firebasearray")
                 .child("objects");
-        mArray = new FirebaseArray<>(mRef, Bean.class);
+        mArray = new FirebaseArray<>(mRef, new ClassSnapshotParser<>(Bean.class));
         mRef.removeValue();
         mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override

database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java

@@ -43,7 +43,7 @@ public class FirebaseArrayTest {
     public void setUp() throws Exception {
         FirebaseApp app = getAppInstance(InstrumentationRegistry.getContext());
         mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray");
-        mArray = new FirebaseArray<>(mRef, Integer.class);
+        mArray = new FirebaseArray<>(mRef, new ClassSnapshotParser<>(Integer.class));
         mRef.removeValue();
         mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override

database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayOfObjectsTest.java

@@ -46,7 +46,7 @@ public void setUp() throws Exception {
         mRef = databaseInstance.getReference().child("firebasearray").child("objects");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray").child("objects");
 
-        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, Bean.class);
+        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, new ClassSnapshotParser<>(Bean.class));
         mRef.removeValue();
         mKeyRef.removeValue();
 

database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java

@@ -47,7 +47,7 @@ public void setUp() throws Exception {
         mRef = databaseInstance.getReference().child("firebasearray");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray");
 
-        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, Integer.class);
+        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, new ClassSnapshotParser<>(Integer.class));
         mRef.removeValue();
         mKeyRef.removeValue();
 

database/src/main/java/com/firebase/ui/database/FirebaseArray.java

@@ -35,23 +35,12 @@ public class FirebaseArray<T> extends ObservableSnapshotArray<T>
     private List<DataSnapshot> mSnapshots = new ArrayList<>();
 
     /**
-     * Create a new FirebaseArray that parses snapshots as members of a given class.
+     * Create a new FirebaseArray with a custom {@link SnapshotParser}.
      *
      * @param query The Firebase location to watch for data changes. Can also be a slice of a
      *              location, using some combination of {@code limit()}, {@code startAt()}, and
      *              {@code endAt()}.
-     * @see ObservableSnapshotArray#ObservableSnapshotArray(Class)
-     */
-    public FirebaseArray(Query query, Class<T> tClass) {
-        super(tClass);
-        init(query);
-    }
-
-    /**
-     * Create a new FirebaseArray with a custom {@link SnapshotParser}.
-     *
      * @see ObservableSnapshotArray#ObservableSnapshotArray(SnapshotParser)
-     * @see FirebaseArray#FirebaseArray(Query, Class)
      */
     public FirebaseArray(Query query, SnapshotParser<T> parser) {
         super(parser);