1 files changed, 8 insertions, 6 deletions

diff --git a/android/arch/lifecycle/LiveDataReactiveStreams.java b/android/arch/lifecycle/LiveDataReactiveStreams.java
index ba76f8e8..ed3c57c3 100644
--- a/android/arch/lifecycle/LiveDataReactiveStreams.java
+++ b/android/arch/lifecycle/LiveDataReactiveStreams.java
@@ -50,8 +50,9 @@ public final class LiveDataReactiveStreams {
      * will buffer the latest item and emit it to the subscriber when data is again requested. Any
      * other items emitted during the time there was no backpressure requested will be dropped.
      */
+    @NonNull
     public static <T> Publisher<T> toPublisher(
-            final LifecycleOwner lifecycle, final LiveData<T> liveData) {
+            @NonNull LifecycleOwner lifecycle, @NonNull LiveData<T> liveData) {
 
         return new LiveDataPublisher<>(lifecycle, liveData);
     }
@@ -60,7 +61,7 @@ public final class LiveDataReactiveStreams {
         final LifecycleOwner mLifecycle;
         final LiveData<T> mLiveData;
 
-        LiveDataPublisher(final LifecycleOwner lifecycle, final LiveData<T> liveData) {
+        LiveDataPublisher(LifecycleOwner lifecycle, LiveData<T> liveData) {
             this.mLifecycle = lifecycle;
             this.mLiveData = liveData;
         }
@@ -91,7 +92,7 @@ public final class LiveDataReactiveStreams {
             }
 
             @Override
-            public void onChanged(T t) {
+            public void onChanged(@Nullable T t) {
                 if (mCanceled) {
                     return;
                 }
@@ -183,7 +184,8 @@ public final class LiveDataReactiveStreams {
      *
      * @param <T> The type of data hold by this instance.
      */
-    public static <T> LiveData<T> fromPublisher(final Publisher<T> publisher) {
+    @NonNull
+    public static <T> LiveData<T> fromPublisher(@NonNull Publisher<T> publisher) {
         return new PublisherLiveData<>(publisher);
     }
 
@@ -209,10 +211,10 @@ public final class LiveDataReactiveStreams {
      * @param <T> The type of data hold by this instance.
      */
     private static class PublisherLiveData<T> extends LiveData<T> {
-        private final Publisher mPublisher;
+        private final Publisher<T> mPublisher;
         final AtomicReference<LiveDataSubscriber> mSubscriber;
 
-        PublisherLiveData(@NonNull final Publisher publisher) {
+        PublisherLiveData(@NonNull Publisher<T> publisher) {
             mPublisher = publisher;
             mSubscriber = new AtomicReference<>();
         }