Merge pull request ReactiveX#87 from omo/auto-value

Fix ReactiveX#63: Use auto-value for Event classes.

Author: JakeWharton

rxandroid/build.gradle

@@ -1,6 +1,16 @@
 // Multi-module modules aren't really supported
 version = rootProject.version
 
+configurations {
+    // This is a rough approximation of Android plug-in's 'provided' configuration, where
+    // you can give compile-time only dependencies.
+    compileOnly
+}
+
+dependencies {
+    compileOnly "com.google.auto.value:auto-value:1.0-rc1"
+}
+
 test {
     testLogging {
         exceptionFormat "full"
@@ -9,3 +19,9 @@ test {
     }
 }
 
+sourceSets {
+    main {
+        compileClasspath += configurations.compileOnly
+    }
+}
+

rxandroid/src/main/java/rx/android/view/OnCheckedChangeEvent.java

@@ -14,17 +14,18 @@
 package rx.android.view;
 
 import android.widget.CompoundButton;
+import com.google.auto.value.AutoValue;
 
-public class OnCheckedChangeEvent {
-    public final CompoundButton view;
-    public final boolean value;
+@AutoValue
+public abstract class OnCheckedChangeEvent {
+    public abstract CompoundButton view();
+    public abstract boolean value();
 
-    public OnCheckedChangeEvent(final CompoundButton view) {
-        this(view, view.isChecked());
+    public static OnCheckedChangeEvent create(final CompoundButton view) {
+        return create(view, view.isChecked());
     }
 
-    public OnCheckedChangeEvent(final CompoundButton view, final boolean value) {
-        this.view = view;
-        this.value = value;
+    public static OnCheckedChangeEvent create(final CompoundButton view, final boolean value) {
+        return new AutoValue_OnCheckedChangeEvent(view, value);
     }
 }

rxandroid/src/main/java/rx/android/view/OnClickEvent.java

@@ -15,10 +15,13 @@
 
 import android.view.View;
 
-public class OnClickEvent {
-    public final View view;
+import com.google.auto.value.AutoValue;
 
-    public OnClickEvent(final View view) {
-        this.view = view;
+@AutoValue
+public abstract class OnClickEvent {
+    public abstract View view();
+
+    public static OnClickEvent create(View view) {
+        return new AutoValue_OnClickEvent(view);
     }
 }

rxandroid/src/main/java/rx/android/view/OnSubscribeViewClick.java

@@ -43,7 +43,7 @@ public void call(final Subscriber<? super OnClickEvent> observer) {
         final View.OnClickListener listener = new View.OnClickListener() {
             @Override
             public void onClick(final View clicked) {
-                observer.onNext(new OnClickEvent(view));
+                observer.onNext(OnClickEvent.create(view));
             }
         };
 
@@ -55,7 +55,7 @@ public void call() {
         });
 
         if (emitInitialValue) {
-            observer.onNext(new OnClickEvent(view));
+            observer.onNext(OnClickEvent.create(view));
         }
 
         composite.addOnClickListener(listener);

rxandroid/src/main/java/rx/android/widget/OnItemClickEvent.java

@@ -17,16 +17,16 @@
 import android.widget.Adapter;
 import android.widget.AdapterView;
 
-public class OnItemClickEvent {
-    public final AdapterView<?> parent;
-    public final View view;
-    public final int position;
-    public final long id;
+import com.google.auto.value.AutoValue;
 
-    public OnItemClickEvent(AdapterView<?> parent, View view, int position, long id) {
-        this.parent = parent;
-        this.view = view;
-        this.position = position;
-        this.id = id;
+@AutoValue
+public abstract class OnItemClickEvent {
+    abstract public AdapterView<?> parent();
+    abstract public View view();
+    abstract public int position();
+    abstract public long id();
+
+    public static OnItemClickEvent create(AdapterView<?> parent, View view, int position, long id) {
+        return new AutoValue_OnItemClickEvent(parent, view, position, id);
     }
 }

rxandroid/src/main/java/rx/android/widget/OnListViewScrollEvent.java

@@ -16,70 +16,19 @@
 
 import android.widget.AbsListView;
 
-public class OnListViewScrollEvent {
-    public final AbsListView listView;
-    public final int scrollState;
-    public final int firstVisibleItem;
-    public final int visibleItemCount;
-    public final int totalItemCount;
+import com.google.auto.value.AutoValue;
 
-    public OnListViewScrollEvent(
-        AbsListView listView, int scrollState, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-        this.listView = listView;
-        this.scrollState = scrollState;
-        this.firstVisibleItem = firstVisibleItem;
-        this.visibleItemCount = visibleItemCount;
-        this.totalItemCount = totalItemCount;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        OnListViewScrollEvent that = (OnListViewScrollEvent) o;
-
-        if (firstVisibleItem != that.firstVisibleItem) {
-            return false;
-        }
-        if (scrollState != that.scrollState) {
-            return false;
-        }
-        if (totalItemCount != that.totalItemCount) {
-            return false;
-        }
-        if (visibleItemCount != that.visibleItemCount) {
-            return false;
-        }
-        if (!listView.equals(that.listView)) {
-            return false;
-        }
+@AutoValue
+public abstract class OnListViewScrollEvent {
+    public abstract AbsListView listView();
+    public abstract int scrollState();
+    public abstract int firstVisibleItem();
+    public abstract int visibleItemCount();
+    public abstract int totalItemCount();
 
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = listView.hashCode();
-        result = 31 * result + scrollState;
-        result = 31 * result + firstVisibleItem;
-        result = 31 * result + visibleItemCount;
-        result = 31 * result + totalItemCount;
-        return result;
+    public static OnListViewScrollEvent create(
+        AbsListView listView, int scrollState, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+        return new AutoValue_OnListViewScrollEvent(listView, scrollState, firstVisibleItem, visibleItemCount, totalItemCount);
     }
 
-    @Override
-    public String toString() {
-        return "OnListViewScrollEvent{" +
-            "listView=" + listView +
-            ", scrollState=" + scrollState +
-            ", firstVisibleItem=" + firstVisibleItem +
-            ", visibleItemCount=" + visibleItemCount +
-            ", totalItemCount=" + totalItemCount +
-            '}';
-    }
 }

rxandroid/src/main/java/rx/android/widget/OnSubscribeAdapterViewOnItemClick.java

@@ -45,7 +45,7 @@ public void call(final Subscriber<? super OnItemClickEvent> observer) {
         final AbsListView.OnItemClickListener listener = new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                observer.onNext(new OnItemClickEvent(parent, view, position, id));
+                observer.onNext(OnItemClickEvent.create(parent, view, position, id));
             }
         };
 

rxandroid/src/main/java/rx/android/widget/OnSubscribeCompoundButtonInput.java

@@ -45,7 +45,7 @@ public void call(final Subscriber<? super OnCheckedChangeEvent> observer) {
         final CompoundButton.OnCheckedChangeListener listener = new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(final CompoundButton view, final boolean checked) {
-                observer.onNext(new OnCheckedChangeEvent(button, checked));
+                observer.onNext(OnCheckedChangeEvent.create(button, checked));
             }
         };
 
@@ -57,7 +57,7 @@ public void call() {
         });
 
         if (emitInitialValue) {
-            observer.onNext(new OnCheckedChangeEvent(button));
+            observer.onNext(OnCheckedChangeEvent.create(button));
         }
 
         composite.addOnCheckedChangeListener(listener);

rxandroid/src/main/java/rx/android/widget/OnSubscribeListViewScroll.java

@@ -50,7 +50,7 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
 
             @Override
             public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                OnListViewScrollEvent event = new OnListViewScrollEvent(view, this.currentScrollState, firstVisibleItem,
+                OnListViewScrollEvent event = OnListViewScrollEvent.create(view, this.currentScrollState, firstVisibleItem,
                     visibleItemCount, totalItemCount);
                 observer.onNext(event);
             }

rxandroid/src/main/java/rx/android/widget/OnSubscribeTextViewInput.java

@@ -38,7 +38,7 @@ public void call(final Subscriber<? super OnTextChangeEvent> observer) {
         final TextWatcher watcher = new SimpleTextWatcher() {
             @Override
             public void afterTextChanged(final Editable editable) {
-                observer.onNext(new OnTextChangeEvent(input));
+                observer.onNext(OnTextChangeEvent.create(input));
             }
         };
 
@@ -50,7 +50,7 @@ public void call() {
         });
 
         if (emitInitialValue) {
-            observer.onNext(new OnTextChangeEvent(input));
+            observer.onNext(OnTextChangeEvent.create(input));
         }
 
         input.addTextChangedListener(watcher);

rxandroid/src/main/java/rx/android/widget/OnTextChangeEvent.java

@@ -16,16 +16,18 @@
 import android.text.SpannableString;
 import android.widget.TextView;
 
-public class OnTextChangeEvent {
-    public final TextView view;
-    public final CharSequence text;
+import com.google.auto.value.AutoValue;
 
-    public OnTextChangeEvent(final TextView view) {
-        this(view, new SpannableString(view.getText()));
+@AutoValue
+public abstract class OnTextChangeEvent {
+    public abstract TextView view();
+    public abstract CharSequence text();
+
+    public static OnTextChangeEvent create(final TextView view) {
+        return create(view, new SpannableString(view.getText()));
     }
 
-    public OnTextChangeEvent(final TextView view, final CharSequence text) {
-        this.view = view;
-        this.text = text;
+    public static OnTextChangeEvent create(final TextView view, final CharSequence text) {
+        return new AutoValue_OnTextChangeEvent(view, text);
     }
 }

rxandroid/src/test/java/rx/android/view/OperatorViewClickTest.java

@@ -37,7 +37,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class OperatorViewClickTest {
     private static OnClickEvent mkMockedEvent(final View view) {
-        return refEq(new OnClickEvent(view));
+        return refEq(OnClickEvent.create(view));
     }
 
     @Test

rxandroid/src/test/java/rx/android/widget/OperatorAdapterViewOnItemClickTest.java

@@ -228,8 +228,9 @@ private void performTestAdapterViewClickAllViewsEmitAllEvents(AdapterView<? exte
         final InOrder inOrder = inOrder(observer);
 
         for (int i = 0; i < adapter.getCount(); i++) {
-            adapterView.performItemClick(any(View.class), i, i);
-            inOrder.verify(observer, times(1)).onNext(new OnItemClickEvent(adapterView, any(View.class), i, i));
+            View fakeItem = new View(adapterView.getContext());
+            adapterView.performItemClick(fakeItem, i, i);
+            inOrder.verify(observer, times(1)).onNext(OnItemClickEvent.create(adapterView, fakeItem, i, i));
         }
 
         subscription.unsubscribe();
@@ -313,9 +314,10 @@ private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEven
 
         final int count = adapter.getCount();
         for (int i = 0; i < count; i++) {
-            adapterView.performItemClick(any(View.class), i, i);
-            inOrder1.verify(observer1, times(1)).onNext(new OnItemClickEvent(adapterView, any(View.class), i, i));
-            inOrder2.verify(observer2, times(1)).onNext(new OnItemClickEvent(adapterView, any(View.class), i, i));
+            View fakeItem = new View(adapterView.getContext());
+            adapterView.performItemClick(fakeItem, i, i);
+            inOrder1.verify(observer1, times(1)).onNext(OnItemClickEvent.create(adapterView, fakeItem, i, i));
+            inOrder2.verify(observer2, times(1)).onNext(OnItemClickEvent.create(adapterView, fakeItem, i, i));
         }
 
         subscription1.unsubscribe();
@@ -342,9 +344,10 @@ private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEven
 
         final int count = adapter.getCount();
         for (int i = 0; i < count; i++) {
-            adapterView.performItemClick(any(View.class), i, i);
+            View fakeItem = new View(adapterView.getContext());
+            adapterView.performItemClick(fakeItem, i, i);
             inOrder1.verify(observer1, never()).onNext(any(OnItemClickEvent.class));
-            inOrder2.verify(observer2, times(1)).onNext(new OnItemClickEvent(adapterView, any(View.class), i, i));
+            inOrder2.verify(observer2, times(1)).onNext(OnItemClickEvent.create(adapterView, fakeItem, i, i));
         }
         subscription2.unsubscribe();
     }

rxandroid/src/test/java/rx/android/widget/OperatorCompoundButtonInputTest.java

@@ -32,7 +32,7 @@
 @RunWith(RobolectricTestRunner.class)
 public class OperatorCompoundButtonInputTest {
     private static OnCheckedChangeEvent mkMockedEvent(final CompoundButton button, final boolean value) {
-        return refEq(new OnCheckedChangeEvent(button, value));
+        return refEq(OnCheckedChangeEvent.create(button, value));
     }
 
     private static CompoundButton mkCompoundButton(final boolean value) {

rxandroid/src/test/java/rx/android/widget/OperatorTextViewInputTest.java

@@ -43,11 +43,11 @@ public boolean matches(final Object argument) {
 
                 final OnTextChangeEvent event = (OnTextChangeEvent) argument;
 
-                if (event.view != view) {
+                if (event.view() != view) {
                     return false;
                 }
 
-                return TextUtils.equals(event.text, text);
+                return TextUtils.equals(event.text(), text);
             }
         });
     }

sample-app/src/main/java/rx/android/samples/ListFragmentActivity.java

@@ -64,12 +64,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
                 .subscribe(new Action1<OnListViewScrollEvent>() {
                     @Override
                     public void call(OnListViewScrollEvent event) {
-                        if (event.totalItemCount == 0) {
+                        if (event.totalItemCount() == 0) {
                             return;
                         }
 
                         int progress =
-                            (int) ((100.0 * (event.firstVisibleItem + event.visibleItemCount)) / event.totalItemCount);
+                            (int) ((100.0 * (event.firstVisibleItem() + event.visibleItemCount())) / event.totalItemCount());
                         progressBar.setProgress(progress);
                     }
                 });