Gradle update (#52)

Versions in constants

build.gradle

@@ -15,6 +15,6 @@ android {
 
 dependencies {
     compileOnly "com.android.support:support-annotations:$supportLibraryVersion"
-    compileOnly "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
-    compileOnly "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
+    compileOnly "io.reactivex:rxandroid:$rxAndroidVersion"
+    compileOnly "io.reactivex:rxjava:$rxJavaVersion"
 }

src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java

@@ -29,8 +29,8 @@ import java.io.Serializable;
 
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 import ru.touchin.roboswag.core.utils.Optional;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
+import rx.Observable;
+import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 24/03/2016.
@@ -47,7 +47,7 @@ public abstract class BaseChangeable<TValue, TReturnValue> implements Serializab
     private transient BehaviorSubject<Optional<TValue>> valueSubject;
 
     public BaseChangeable(@Nullable final TValue defaultValue) {
-        valueSubject = BehaviorSubject.createDefault(new Optional<>(defaultValue));
+        valueSubject = BehaviorSubject.create(new Optional<>(defaultValue));
     }
 
     @NonNull
@@ -88,7 +88,7 @@ public abstract class BaseChangeable<TValue, TReturnValue> implements Serializab
 
     @SuppressWarnings("unchecked")
     private void readObject(@NonNull final ObjectInputStream inputStream) throws IOException, ClassNotFoundException {
-        valueSubject = BehaviorSubject.createDefault((Optional<TValue>) inputStream.readObject());
+        valueSubject = BehaviorSubject.create((Optional<TValue>) inputStream.readObject());
     }
 
     @Override

src/main/java/ru/touchin/roboswag/core/observables/Changeable.java

@@ -22,15 +22,16 @@ package ru.touchin.roboswag.core.observables;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import io.reactivex.Observable;
 import ru.touchin.roboswag.core.utils.Optional;
+import rx.Observable;
 
 /**
  * Created by Gavriil Sitnikov on 24/03/2016.
  * Variant of {@link BaseChangeable} which is allows to set nullable values.
  * Needed to separate non-null Changeable from nullable Changeable.
  */
-public class Changeable<T> extends BaseChangeable<T, Optional<T>> {
+//COMPATIBILITY NOTE: in RxJava2 it should extends BaseChangeable<T, Optional<T>>
+public class Changeable<T> extends BaseChangeable<T, T> {
 
     public Changeable(@Nullable final T defaultValue) {
         super(defaultValue);
@@ -43,8 +44,9 @@ public class Changeable<T> extends BaseChangeable<T, Optional<T>> {
      */
     @NonNull
     @Override
-    public Observable<Optional<T>> observe() {
-        return observeOptionalValue();
+    //COMPATIBILITY NOTE: in RxJava2 it should be Observable<Optional<T>>
+    public Observable<T> observe() {
+        return observeOptionalValue().map(Optional::get);
     }
 
 }

src/main/java/ru/touchin/roboswag/core/observables/NonNullChangeable.java

@@ -23,7 +23,7 @@ import android.support.annotation.NonNull;
 
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import io.reactivex.Observable;
+import rx.Observable;
 
 /**
  * Created by Gavriil Sitnikov on 24/03/2016.

src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java

@@ -1,299 +0,0 @@
-/**
- * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
- * the License for the specific language governing permissions and limitations under the License.
- */
-
-package ru.touchin.roboswag.core.observables;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReentrantLock;
-
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * Returns an observable sequence that stays connected to the source as long as
- * there is at least one subscription to the observable sequence.
- *
- * @param <T> the value type
- */
-@SuppressWarnings({"PMD.CompareObjectsWithEquals", "PMD.AvoidUsingVolatile"})
-//AvoidUsingVolatile: it's RxJava code
-public final class ObservableRefCountWithCacheTime<T> extends Observable<T> implements HasUpstreamObservableSource<T> {
-
-    @NonNull
-    private final ConnectableObservable<? extends T> connectableSource;
-    @NonNull
-    private final ObservableSource<T> actualSource;
-
-    @NonNull
-    private volatile CompositeDisposable baseDisposable = new CompositeDisposable();
-
-    @NonNull
-    private final AtomicInteger subscriptionCount = new AtomicInteger();
-
-    /**
-     * Use this lock for every subscription and disconnect action.
-     */
-    @NonNull
-    private final ReentrantLock lock = new ReentrantLock();
-
-    @NonNull
-    private final Scheduler scheduler = Schedulers.computation();
-    private final long cacheTime;
-    @NonNull
-    private final TimeUnit cacheTimeUnit;
-    @Nullable
-    private Scheduler.Worker worker;
-
-    /**
-     * Constructor.
-     *
-     * @param source observable to apply ref count to
-     */
-    public ObservableRefCountWithCacheTime(@NonNull final ConnectableObservable<T> source,
-                                           final long cacheTime, @NonNull final TimeUnit cacheTimeUnit) {
-        super();
-        this.connectableSource = source;
-        this.actualSource = source;
-        this.cacheTime = cacheTime;
-        this.cacheTimeUnit = cacheTimeUnit;
-    }
-
-    @NonNull
-    public ObservableSource<T> source() {
-        return actualSource;
-    }
-
-    private void cleanupWorker() {
-        if (worker != null) {
-            worker.dispose();
-            worker = null;
-        }
-    }
-
-    @Override
-    public void subscribeActual(@NonNull final Observer<? super T> subscriber) {
-
-        lock.lock();
-        if (subscriptionCount.incrementAndGet() == 1) {
-            cleanupWorker();
-            final AtomicBoolean writeLocked = new AtomicBoolean(true);
-
-            try {
-                // need to use this overload of connect to ensure that
-                // baseDisposable is set in the case that source is a
-                // synchronous Observable
-                connectableSource.connect(onSubscribe(subscriber, writeLocked));
-            } finally {
-                // need to cover the case where the source is subscribed to
-                // outside of this class thus preventing the Action1 passed
-                // to source.connect above being called
-                if (writeLocked.get()) {
-                    // Action1 passed to source.connect was not called
-                    lock.unlock();
-                }
-            }
-        } else {
-            try {
-                // ready to subscribe to source so do it
-                doSubscribe(subscriber, baseDisposable);
-            } finally {
-                // release the read lock
-                lock.unlock();
-            }
-        }
-
-    }
-
-    @NonNull
-    private Consumer<Disposable> onSubscribe(@NonNull final Observer<? super T> observer, @NonNull final AtomicBoolean writeLocked) {
-        return new DisposeConsumer(observer, writeLocked);
-    }
-
-    private void doSubscribe(@NonNull final Observer<? super T> observer, @NonNull final CompositeDisposable currentBase) {
-        // handle disposing from the base CompositeDisposable
-        final Disposable disposable = disconnect(currentBase);
-
-        final ConnectionObserver connectionObserver = new ConnectionObserver(observer, currentBase, disposable);
-        observer.onSubscribe(connectionObserver);
-
-        connectableSource.subscribe(connectionObserver);
-    }
-
-    @NonNull
-    private Disposable disconnect(@NonNull final CompositeDisposable current) {
-        return Disposables.fromRunnable(new DisposeTask(current));
-    }
-
-    private final class ConnectionObserver extends AtomicReference<Disposable> implements Observer<T>, Disposable {
-
-        private static final long serialVersionUID = 3813126992133394324L;
-
-        @NonNull
-        private final Observer<? super T> subscriber;
-        @NonNull
-        private final CompositeDisposable currentBase;
-        @NonNull
-        private final Disposable resource;
-
-        public ConnectionObserver(@NonNull final Observer<? super T> subscriber, @NonNull final CompositeDisposable currentBase,
-                                  @NonNull final Disposable resource) {
-            super();
-            this.subscriber = subscriber;
-            this.currentBase = currentBase;
-            this.resource = resource;
-        }
-
-        @Override
-        public void onSubscribe(@NonNull final Disposable disposable) {
-            DisposableHelper.setOnce(this, disposable);
-        }
-
-        @Override
-        public void onError(@NonNull final Throwable throwable) {
-            cleanup();
-            subscriber.onError(throwable);
-        }
-
-        @Override
-        public void onNext(@NonNull final T item) {
-            subscriber.onNext(item);
-        }
-
-        @Override
-        public void onComplete() {
-            cleanup();
-            subscriber.onComplete();
-        }
-
-        @Override
-        public void dispose() {
-            DisposableHelper.dispose(this);
-            resource.dispose();
-        }
-
-        @Override
-        public boolean isDisposed() {
-            return DisposableHelper.isDisposed(get());
-        }
-
-        private void cleanup() {
-            // on error or completion we need to dispose the base CompositeDisposable
-            // and set the subscriptionCount to 0
-            lock.lock();
-            try {
-                if (baseDisposable == currentBase) {
-                    cleanupWorker();
-                    if (connectableSource instanceof Disposable) {
-                        ((Disposable) connectableSource).dispose();
-                    }
-
-                    baseDisposable.dispose();
-                    baseDisposable = new CompositeDisposable();
-                    subscriptionCount.set(0);
-                }
-            } finally {
-                lock.unlock();
-            }
-        }
-
-    }
-
-    private final class DisposeConsumer implements Consumer<Disposable> {
-
-        @NonNull
-        private final Observer<? super T> observer;
-        @NonNull
-        private final AtomicBoolean writeLocked;
-
-        public DisposeConsumer(@NonNull final Observer<? super T> observer, @NonNull final AtomicBoolean writeLocked) {
-            this.observer = observer;
-            this.writeLocked = writeLocked;
-        }
-
-        @Override
-        public void accept(@NonNull final Disposable subscription) {
-            try {
-                baseDisposable.add(subscription);
-                // ready to subscribe to source so do it
-                doSubscribe(observer, baseDisposable);
-            } finally {
-                // release the write lock
-                lock.unlock();
-                writeLocked.set(false);
-            }
-        }
-
-    }
-
-    private final class DisposeTask implements Runnable {
-
-        @NonNull
-        private final CompositeDisposable current;
-
-        public DisposeTask(@NonNull final CompositeDisposable current) {
-            this.current = current;
-        }
-
-        @Override
-        public void run() {
-            lock.lock();
-            try {
-                if (baseDisposable == current && subscriptionCount.decrementAndGet() == 0) {
-                    if (worker != null) {
-                        worker.dispose();
-                    } else {
-                        worker = scheduler.createWorker();
-                    }
-                    worker.schedule(() -> {
-                        lock.lock();
-                        try {
-                            if (subscriptionCount.get() == 0) {
-                                cleanupWorker();
-                                if (connectableSource instanceof Disposable) {
-                                    ((Disposable) connectableSource).dispose();
-                                }
-
-                                baseDisposable.dispose();
-                                // need a new baseDisposable because once
-                                // disposed stays that way
-                                baseDisposable = new CompositeDisposable();
-                            }
-                        } finally {
-                            lock.unlock();
-                        }
-                    }, cacheTime, cacheTimeUnit);
-                }
-            } finally {
-                lock.unlock();
-            }
-        }
-
-    }
-
-}

src/main/java/ru/touchin/roboswag/core/observables/OnSubscribeRefCountWithCacheTime.java

@@ -0,0 +1,213 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package ru.touchin.roboswag.core.observables;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+import rx.Observable.OnSubscribe;
+import rx.Scheduler;
+import rx.Subscriber;
+import rx.Subscription;
+import rx.functions.Action1;
+import rx.observables.ConnectableObservable;
+import rx.schedulers.Schedulers;
+import rx.subscriptions.CompositeSubscription;
+import rx.subscriptions.Subscriptions;
+
+/**
+ * Returns an observable sequence that stays connected to the source as long as
+ * there is at least one subscription to the observable sequence and also it stays connected
+ * for cache time after everyone unsubscribe.
+ *
+ * @param <T> the value type
+ */
+@SuppressWarnings({"PMD.AvoidUsingVolatile", "PMD.CompareObjectsWithEquals"})
+//AvoidUsingVolatile,CompareObjectsWithEquals: from OnSubscribeRefCount code
+public final class OnSubscribeRefCountWithCacheTime<T> implements OnSubscribe<T> {
+
+    @NonNull
+    private final ConnectableObservable<? extends T> source;
+    @NonNull
+    private volatile CompositeSubscription baseSubscription = new CompositeSubscription();
+    @NonNull
+    private final AtomicInteger subscriptionCount = new AtomicInteger(0);
+
+    @NonNull
+    private final Scheduler scheduler = Schedulers.computation();
+    private final long cacheTime;
+    @NonNull
+    private final TimeUnit cacheTimeUnit;
+    @Nullable
+    private Scheduler.Worker worker;
+
+    /**
+     * Use this lock for every subscription and disconnect action.
+     */
+    @NonNull
+    private final ReentrantLock lock = new ReentrantLock();
+
+    public OnSubscribeRefCountWithCacheTime(@NonNull final ConnectableObservable<? extends T> source,
+                                            final long cacheTime, @NonNull final TimeUnit cacheTimeUnit) {
+        this.source = source;
+        this.cacheTime = cacheTime;
+        this.cacheTimeUnit = cacheTimeUnit;
+    }
+
+    @Override
+    public void call(@NonNull final Subscriber<? super T> subscriber) {
+
+        lock.lock();
+        if (subscriptionCount.incrementAndGet() == 1) {
+            if (worker != null) {
+                worker.unsubscribe();
+                worker = null;
+            }
+            final AtomicBoolean writeLocked = new AtomicBoolean(true);
+
+            try {
+                // need to use this overload of connect to ensure that
+                // baseSubscription is set in the case that source is a
+                // synchronous Observable
+                source.connect(onSubscribe(subscriber, writeLocked));
+            } finally {
+                // need to cover the case where the source is subscribed to
+                // outside of this class thus preventing the Action1 passed
+                // to source.connect above being called
+                if (writeLocked.get()) {
+                    // Action1 passed to source.connect was not called
+                    lock.unlock();
+                }
+            }
+        } else {
+            try {
+                // ready to subscribe to source so do it
+                doSubscribe(subscriber, baseSubscription);
+            } finally {
+                // release the read lock
+                lock.unlock();
+            }
+        }
+
+    }
+
+    @NonNull
+    private Action1<Subscription> onSubscribe(@NonNull final Subscriber<? super T> subscriber,
+                                              @NonNull final AtomicBoolean writeLocked) {
+        return subscription -> {
+            try {
+                baseSubscription.add(subscription);
+                // ready to subscribe to source so do it
+                doSubscribe(subscriber, baseSubscription);
+            } finally {
+                // release the write lock
+                lock.unlock();
+                writeLocked.set(false);
+            }
+        };
+    }
+
+    private void doSubscribe(@NonNull final Subscriber<? super T> subscriber, @NonNull final CompositeSubscription currentBase) {
+        subscriber.add(disconnect(currentBase));
+        source.unsafeSubscribe(new Subscriber<T>(subscriber) {
+            @Override
+            public void onError(@NonNull final Throwable throwable) {
+                cleanup();
+                subscriber.onError(throwable);
+            }
+
+            @Override
+            public void onNext(@Nullable final T item) {
+                subscriber.onNext(item);
+            }
+
+            @Override
+            public void onCompleted() {
+                cleanup();
+                subscriber.onCompleted();
+            }
+
+            private void cleanup() {
+                // on error or completion we need to unsubscribe the base subscription and set the subscriptionCount to 0
+                lock.lock();
+                try {
+                    if (baseSubscription == currentBase) {
+                        cleanupWorker();
+                        // backdoor into the ConnectableObservable to cleanup and reset its state
+                        if (source instanceof Subscription) {
+                            ((Subscription) source).unsubscribe();
+                        }
+                        baseSubscription.unsubscribe();
+                        baseSubscription = new CompositeSubscription();
+                        subscriptionCount.set(0);
+                    }
+                } finally {
+                    lock.unlock();
+                }
+            }
+        });
+    }
+
+    @NonNull
+    private Subscription disconnect(@NonNull final CompositeSubscription current) {
+        return Subscriptions.create(() -> {
+            lock.lock();
+            try {
+                if (baseSubscription == current && subscriptionCount.decrementAndGet() == 0) {
+                    if (worker != null) {
+                        worker.unsubscribe();
+                    } else {
+                        worker = scheduler.createWorker();
+                    }
+                    worker.schedule(() -> {
+                        lock.lock();
+                        try {
+                            if (subscriptionCount.get() == 0) {
+                                cleanupWorker();
+                                // backdoor into the ConnectableObservable to cleanup and reset its state
+                                if (source instanceof Subscription) {
+                                    ((Subscription) source).unsubscribe();
+                                }
+                                baseSubscription.unsubscribe();
+                                // need a new baseSubscription because once
+                                // unsubscribed stays that way
+                                baseSubscription = new CompositeSubscription();
+                            }
+                        } finally {
+                            lock.unlock();
+                        }
+                    }, cacheTime, cacheTimeUnit);
+                }
+            } finally {
+                lock.unlock();
+            }
+        });
+    }
+
+    private void cleanupWorker() {
+        if (worker != null) {
+            worker.unsubscribe();
+            worker = null;
+        }
+    }
+
+}

src/main/java/ru/touchin/roboswag/core/observables/RxAndroidUtils.java

@@ -33,12 +33,12 @@ import android.support.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
 
-import io.reactivex.Emitter;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ServiceBinder;
+import rx.Emitter;
+import rx.Observable;
+import rx.Scheduler;
+import rx.android.schedulers.AndroidSchedulers;
 
 /**
  * Created by Gavriil Sitnikov on 10/01/2016.
@@ -62,8 +62,8 @@ public final class RxAndroidUtils {
                         .<T>create(emitter -> {
                             onSubscribeServiceConnection.emitter = emitter;
                             context.bindService(new Intent(context, serviceClass), onSubscribeServiceConnection, Context.BIND_AUTO_CREATE);
-                        })
-                        .doOnDispose(() -> {
+                        }, Emitter.BackpressureMode.LATEST)
+                        .doOnUnsubscribe(() -> {
                             context.unbindService(onSubscribeServiceConnection);
                             onSubscribeServiceConnection.emitter = null;
                         }))
@@ -87,8 +87,8 @@ public final class RxAndroidUtils {
                         .<Intent>create(emitter -> {
                             onOnSubscribeBroadcastReceiver.emitter = emitter;
                             context.registerReceiver(onOnSubscribeBroadcastReceiver, intentFilter);
-                        })
-                        .doOnDispose(() -> {
+                        }, Emitter.BackpressureMode.LATEST)
+                        .doOnUnsubscribe(() -> {
                             context.unregisterReceiver(onOnSubscribeBroadcastReceiver);
                             onOnSubscribeBroadcastReceiver.emitter = null;
                         }))

src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java

@@ -31,8 +31,8 @@ import java.util.List;
 
 import ru.touchin.roboswag.core.observables.collections.changes.Change;
 import ru.touchin.roboswag.core.observables.collections.changes.CollectionChanges;
-import io.reactivex.Emitter;
-import io.reactivex.Observable;
+import rx.Emitter;
+import rx.Observable;
 
 /**
  * Created by Gavriil Sitnikov on 23/05/16.
@@ -60,8 +60,8 @@ public abstract class ObservableCollection<TItem> {
     @NonNull
     private Observable<CollectionChanges<TItem>> createChangesObservable() {
         return Observable
-                .<CollectionChanges<TItem>>create(emitter -> this.changesEmitter = emitter)
-                .doOnDispose(() -> this.changesEmitter = null)
+                .<CollectionChanges<TItem>>create(emitter -> this.changesEmitter = emitter, Emitter.BackpressureMode.BUFFER)
+                .doOnUnsubscribe(() -> this.changesEmitter = null)
                 .share();
     }
 

src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java

@@ -10,11 +10,10 @@ import java.util.List;
 import java.util.concurrent.Executors;
 
 import ru.touchin.roboswag.core.observables.collections.changes.DefaultCollectionsChangesCalculator;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import ru.touchin.roboswag.core.log.Lc;
+import rx.Scheduler;
+import rx.Subscription;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
 
 /**
  * Created by Gavriil Sitnikov on 02/06/2016.
@@ -30,19 +29,15 @@ public class ObservableFilteredList<TItem> extends ObservableCollection<TItem> {
 
     @NonNull
     private static <TItem> List<TItem> filterCollection(@NonNull final Collection<TItem> sourceCollection,
-                                                        @Nullable final Function<TItem, Boolean> filter) {
+                                                        @Nullable final Func1<TItem, Boolean> filter) {
         if (filter == null) {
             return new ArrayList<>(sourceCollection);
         }
         final List<TItem> result = new ArrayList<>(sourceCollection.size());
-        try {
-            for (final TItem item : sourceCollection) {
-                if (filter.apply(item)) {
-                    result.add(item);
-                }
+        for (final TItem item : sourceCollection) {
+            if (filter.call(item)) {
+                result.add(item);
             }
-        } catch (final Exception exception) {
-            Lc.assertion(exception);
         }
         return result;
     }
@@ -52,23 +47,23 @@ public class ObservableFilteredList<TItem> extends ObservableCollection<TItem> {
     @NonNull
     private ObservableCollection<TItem> sourceCollection;
     @Nullable
-    private Function<TItem, Boolean> filter;
+    private Func1<TItem, Boolean> filter;
     @Nullable
-    private Disposable sourceCollectionSubscription;
+    private Subscription sourceCollectionSubscription;
 
     public ObservableFilteredList() {
         this(new ArrayList<>(), null);
     }
 
-    public ObservableFilteredList(@NonNull final Function<TItem, Boolean> filter) {
+    public ObservableFilteredList(@NonNull final Func1<TItem, Boolean> filter) {
         this(new ArrayList<>(), filter);
     }
 
-    public ObservableFilteredList(@NonNull final Collection<TItem> sourceCollection, @Nullable final Function<TItem, Boolean> filter) {
+    public ObservableFilteredList(@NonNull final Collection<TItem> sourceCollection, @Nullable final Func1<TItem, Boolean> filter) {
         this(new ObservableList<>(sourceCollection), filter);
     }
 
-    public ObservableFilteredList(@NonNull final ObservableCollection<TItem> sourceCollection, @Nullable final Function<TItem, Boolean> filter) {
+    public ObservableFilteredList(@NonNull final ObservableCollection<TItem> sourceCollection, @Nullable final Func1<TItem, Boolean> filter) {
         super();
         this.filter = filter;
         this.sourceCollection = sourceCollection;
@@ -101,14 +96,14 @@ public class ObservableFilteredList<TItem> extends ObservableCollection<TItem> {
      *
      * @param filter Function to filter item. True - item will stay, false - item will be filtered.
      */
-    public void setFilter(@Nullable final Function<TItem, Boolean> filter) {
+    public void setFilter(@Nullable final Func1<TItem, Boolean> filter) {
         this.filter = filter;
         updateInternal();
     }
 
     private void updateInternal() {
         if (sourceCollectionSubscription != null) {
-            sourceCollectionSubscription.dispose();
+            sourceCollectionSubscription.unsubscribe();
             sourceCollectionSubscription = null;
         }
         sourceCollectionSubscription = sourceCollection.observeItems()

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/LoadingMoreList.java

@@ -26,21 +26,22 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
+import java.util.NoSuchElementException;
 import java.util.concurrent.Executors;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
 import ru.touchin.roboswag.core.observables.collections.ObservableList;
 import ru.touchin.roboswag.core.observables.collections.changes.Change;
 import ru.touchin.roboswag.core.observables.collections.changes.CollectionChanges;
-import ru.touchin.roboswag.core.utils.Optional;
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+import rx.Observable;
+import rx.Scheduler;
+import rx.exceptions.OnErrorThrowable;
+import rx.functions.Func0;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 23/05/16.
@@ -66,7 +67,7 @@ public class LoadingMoreList<TItem, TMoreReference, TLoadedItems extends LoadedI
     @NonNull
     private Observable<TLoadedItems> loadingMoreObservable;
     @NonNull
-    private final BehaviorSubject<Integer> moreItemsCount = BehaviorSubject.createDefault(LoadedItems.UNKNOWN_ITEMS_COUNT);
+    private final BehaviorSubject<Integer> moreItemsCount = BehaviorSubject.create(LoadedItems.UNKNOWN_ITEMS_COUNT);
     @NonNull
     private final ObservableList<TItem> innerList = new ObservableList<>();
     @Nullable
@@ -84,8 +85,14 @@ public class LoadingMoreList<TItem, TMoreReference, TLoadedItems extends LoadedI
                            @Nullable final LoadedItems<TItem, TMoreReference> initialItems) {
         super();
         this.loadingMoreObservable = Observable
-                .switchOnNext(Observable
-                        .fromCallable(() -> createLoadRequestBasedObservable(this::createActualRequest, moreMoreItemsLoader::load).toObservable()))
+                .switchOnNext(Observable.fromCallable(() -> createLoadRequestBasedObservable(this::createActualRequest, moreMoreItemsLoader::load)))
+                .single()
+                .doOnError(throwable -> {
+                    if (throwable instanceof IllegalArgumentException || throwable instanceof NoSuchElementException) {
+                        Lc.assertion(new ShouldNotHappenException("Updates during loading not supported."
+                                + " MoreItemsLoader should emit only one result.", throwable));
+                    }
+                })
                 .doOnNext(loadedItems -> onItemsLoaded(loadedItems, size(), false))
                 .replay(1)
                 .refCount();
@@ -106,16 +113,16 @@ public class LoadingMoreList<TItem, TMoreReference, TLoadedItems extends LoadedI
     }
 
     @NonNull
-    protected <T, TRequest> Single<T> createLoadRequestBasedObservable(@NonNull final Callable<TRequest> requestCreator,
-                                                                       @NonNull final Function<TRequest, Single<T>> observableCreator) {
-        return Single
+    protected <T, TRequest> Observable<T> createLoadRequestBasedObservable(@NonNull final Func0<TRequest> requestCreator,
+                                                                           @NonNull final Func1<TRequest, Observable<T>> observableCreator) {
+        return Observable
                 .fromCallable(requestCreator)
-                .flatMap(loadRequest -> observableCreator.apply(loadRequest)
+                .switchMap(loadRequest -> observableCreator.call(loadRequest)
                         .subscribeOn(Schedulers.io())
                         .observeOn(loaderScheduler)
-                        .doOnSuccess(ignored -> {
+                        .doOnNext(ignored -> {
                             if (!requestCreator.call().equals(loadRequest)) {
-                                throw new RequestChangedDuringLoadingException();
+                                throw OnErrorThrowable.from(new RequestChangedDuringLoadingException());
                             }
                         }))
                 .retry((number, throwable) ->
@@ -290,20 +297,20 @@ public class LoadingMoreList<TItem, TMoreReference, TLoadedItems extends LoadedI
      * @return {@link Observable} to load item.
      */
     @NonNull
-    public Single<Optional<TItem>> loadItem(final int position) {
-        return Observable.switchOnNext(Observable
-                .fromCallable(() -> {
-                    if (position < size()) {
-                        return Observable.just(new Optional<>(get(position)));
-                    } else if (moreItemsCount.getValue() == 0) {
-                        return Observable.just(new Optional<TItem>(null));
-                    } else {
-                        return loadingMoreObservable.switchMap(ignored -> Observable.<Optional<TItem>>error(new NotLoadedYetException()));
-                    }
-                }))
-                .subscribeOn(loaderScheduler)
-                .retry((number, throwable) -> throwable instanceof NotLoadedYetException)
-                .firstOrError();
+    public Observable<TItem> loadItem(final int position) {
+        return Observable
+                .switchOnNext(Observable
+                        .fromCallable(() -> {
+                            if (position < size()) {
+                                return Observable.just(get(position));
+                            } else if (moreItemsCount.getValue() == 0) {
+                                return Observable.just((TItem) null);
+                            } else {
+                                return loadingMoreObservable.switchMap(ignored -> Observable.<TItem>error(new NotLoadedYetException()));
+                            }
+                        })
+                        .subscribeOn(loaderScheduler))
+                .retry((number, throwable) -> throwable instanceof NotLoadedYetException);
     }
 
     /**
@@ -315,24 +322,15 @@ public class LoadingMoreList<TItem, TMoreReference, TLoadedItems extends LoadedI
      * @return {@link Observable} to load items.
      */
     @NonNull
-    @SuppressWarnings("unchecked")
-    //unchecked: it's OK for such zip operator
-    public Single<Collection<TItem>> loadRange(final int first, final int last) {
-        final List<Single<Optional<TItem>>> itemsRequests = new ArrayList<>();
+    public Observable<Collection<TItem>> loadRange(final int first, final int last) {
+        final List<Observable<TItem>> itemsRequests = new ArrayList<>();
         for (int i = first; i <= last; i++) {
             itemsRequests.add(loadItem(i));
         }
-        return Single.zip(itemsRequests,
-                items -> {
-                    final List<TItem> result = new ArrayList<>();
-                    for (final Object item : items) {
-                        final Optional<TItem> optional = (Optional<TItem>) item;
-                        if (optional.get() != null) {
-                            result.add(optional.get());
-                        }
-                    }
-                    return Collections.unmodifiableCollection(result);
-                });
+        return Observable.concatEager(itemsRequests)
+                .filter(loadedItem -> loadedItem != null)
+                .toList()
+                .map(Collections::unmodifiableCollection);
     }
 
     /**

src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/MoreItemsLoader.java

@@ -21,7 +21,7 @@ package ru.touchin.roboswag.core.observables.collections.loadable;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.Single;
+import rx.Observable;
 
 /**
  * Created by Gavriil Sitnikov on 02/06/2016.
@@ -34,12 +34,12 @@ import io.reactivex.Single;
 public interface MoreItemsLoader<TItem, TMoreReference, TLoadedItems extends LoadedItems<TItem, TMoreReference>> {
 
     /**
-     * Returns {@link Single} that could load next part of items.
+     * Returns {@link Observable} that could load next part of items.
      *
      * @param moreLoadRequest Request with info inside to load next part of items;
-     * @return {@link Single} of loading items.
+     * @return {@link Observable} of loading items.
      */
     @NonNull
-    Single<TLoadedItems> load(@NonNull final MoreLoadRequest<TMoreReference> moreLoadRequest);
+    Observable<TLoadedItems> load(@NonNull final MoreLoadRequest<TMoreReference> moreLoadRequest);
 
 }

src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java

@@ -26,17 +26,19 @@ import java.lang.reflect.Type;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
+import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
-import ru.touchin.roboswag.core.observables.ObservableRefCountWithCacheTime;
+import ru.touchin.roboswag.core.observables.OnSubscribeRefCountWithCacheTime;
 import ru.touchin.roboswag.core.utils.ObjectUtils;
 import ru.touchin.roboswag.core.utils.Optional;
+import rx.Completable;
+import rx.Observable;
+import rx.Scheduler;
+import rx.Single;
+import rx.exceptions.OnErrorThrowable;
+import rx.functions.Actions;
+import rx.schedulers.Schedulers;
+import rx.subjects.PublishSubject;
 
 /**
  * Created by Gavriil Sitnikov on 04/10/2015.
@@ -121,8 +123,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
     }
 
     @Nullable
-    private Optional<TStoreObject> returnDefaultValueIfNull(@NonNull final Optional<TStoreObject> storeObject, @Nullable final TObject defaultValue)
-            throws Converter.ConversionException {
+    private Optional<TStoreObject> returnDefaultValueIfNull(@NonNull final Optional<TStoreObject> storeObject, @Nullable final TObject defaultValue) {
         if (storeObject.get() != null || defaultValue == null) {
             return storeObject;
         }
@@ -132,7 +133,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
         } catch (final Converter.ConversionException exception) {
             STORABLE_LC_GROUP.w(exception, "Exception while converting default value of '%s' from '%s' from store %s",
                     key, defaultValue, store);
-            throw exception;
+            throw OnErrorThrowable.from(exception);
         }
     }
 
@@ -159,7 +160,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
                 .concatWith(newStoreValueEvent)
                 .map(storeObject -> returnDefaultValueIfNull(storeObject, defaultValue));
         return observeStrategy == ObserveStrategy.CACHE_STORE_VALUE || observeStrategy == ObserveStrategy.CACHE_STORE_AND_ACTUAL_VALUE
-                ? RxJavaPlugins.onAssembly(new ObservableRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
+                ? Observable.unsafeCreate(new OnSubscribeRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
                 : result;
     }
 
@@ -174,11 +175,11 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
                     } catch (final Converter.ConversionException exception) {
                         STORABLE_LC_GROUP.w(exception, "Exception while trying to converting value of '%s' from store %s by %s",
                                 key, storeObject, store, converter);
-                        throw exception;
+                        throw OnErrorThrowable.from(exception);
                     }
                 });
         return observeStrategy == ObserveStrategy.CACHE_ACTUAL_VALUE || observeStrategy == ObserveStrategy.CACHE_STORE_AND_ACTUAL_VALUE
-                ? RxJavaPlugins.onAssembly(new ObservableRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
+                ? Observable.unsafeCreate(new OnSubscribeRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
                 : result;
     }
 
@@ -234,7 +235,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
 
     @NonNull
     private Completable internalSet(@Nullable final TObject newValue, final boolean checkForEqualityBeforeSet) {
-        return (checkForEqualityBeforeSet ? storeValueObservable.firstOrError() : Single.just(new Optional<>(null)))
+        return (checkForEqualityBeforeSet ? storeValueObservable.take(1).toSingle() : Single.just(new Optional<>(null)))
                 .observeOn(scheduler)
                 .flatMapCompletable(oldStoreValue -> {
                     final TStoreObject newStoreValue;
@@ -273,9 +274,10 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      * @param newValue Value to set;
      * @return Observable of setting process.
      */
+    //COMPATIBILITY NOTE: it is not Completable to prevent migration of old code
     @NonNull
-    public Completable forceSet(@Nullable final TObject newValue) {
-        return internalSet(newValue, false);
+    public Observable<?> forceSet(@Nullable final TObject newValue) {
+        return internalSet(newValue, false).toObservable();
     }
 
     /**
@@ -288,9 +290,16 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      * @param newValue Value to set;
      * @return Observable of setting process.
      */
+    //COMPATIBILITY NOTE: it is not Completable to prevent migration of old code
     @NonNull
-    public Completable set(@Nullable final TObject newValue) {
-        return internalSet(newValue, true);
+    public Observable<?> set(@Nullable final TObject newValue) {
+        return internalSet(newValue, true).toObservable();
+    }
+
+    @Deprecated
+    //COMPATIBILITY NOTE: it is deprecated as it's execution not bound to Android lifecycle objects
+    public void setCalm(@Nullable final TObject newValue) {
+        set(newValue).subscribe(Actions.empty(), Lc::assertion);
     }
 
     /**
@@ -301,7 +310,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
     @Deprecated
     //deprecation: it should be used for debug only and in very rare cases.
     public void setSync(@Nullable final TObject newValue) {
-        set(newValue).blockingAwait();
+        set(newValue).toBlocking().subscribe();
     }
 
     @NonNull
@@ -325,8 +334,9 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      * @return Returns observable of value.
      */
     @NonNull
-    public Single<TReturnObject> get() {
-        return observe().firstOrError();
+    //COMPATIBILITY NOTE: it is not Single to prevent migration of old code
+    public Observable<TReturnObject> get() {
+        return observe().take(1);
     }
 
     /**
@@ -334,16 +344,11 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      *
      * @return Returns value;
      */
+    @Deprecated
+    //deprecation: it should be used for debug only and in very rare cases.
     @Nullable
-    public TObject getSync() {
-        final TStoreObject storeObject = store.getObject(storeObjectType, key);
-        try {
-            return converter.toObject(objectType, storeObjectType, storeObject);
-        } catch (final Converter.ConversionException exception) {
-            STORABLE_LC_GROUP.w(exception, "Exception while trying to converting value of '%s' from store %s by %s",
-                    key, storeObject, store, converter);
-            return null;
-        }
+    public TReturnObject getSync() {
+        return get().toBlocking().first();
     }
 
     /**

src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java

@@ -24,9 +24,10 @@ import android.support.annotation.NonNull;
 import java.util.Arrays;
 import java.util.List;
 
-import io.reactivex.Completable;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
+import rx.Completable;
+import rx.Observable;
+import rx.Single;
+import rx.exceptions.OnErrorThrowable;
 
 /**
  * Created by Gavriil Sitnikov on 06/10/2015.
@@ -90,16 +91,15 @@ public class Migration<TKey> {
                     return makeMigrationChain(key, versionUpdater)
                             .doOnSuccess(lastUpdatedVersion -> {
                                 if (lastUpdatedVersion < latestVersion) {
-                                    throw new NextLoopMigrationException();
+                                    throw OnErrorThrowable.from(new NextLoopMigrationException());
                                 }
                                 if (versionUpdater.initialVersion == versionUpdater.oldVersion) {
                                     throw new MigrationException(String.format("Version of '%s' not updated from %s",
                                             key, versionUpdater.initialVersion));
                                 }
                             })
-                            .retryWhen(attempts -> attempts
-                                    .switchMap(throwable -> throwable instanceof NextLoopMigrationException
-                                            ? Flowable.just(new Object()) : Flowable.error(throwable)));
+                            .retryWhen(attempts -> attempts.switchMap(throwable -> throwable instanceof NextLoopMigrationException
+                                    ? Observable.just(null) : Observable.error(throwable)));
                 })
                 .toCompletable()
                 .andThen(versionsStore.storeObject(Long.class, key, latestVersion))

src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java

@@ -21,7 +21,7 @@ package ru.touchin.roboswag.core.observables.storable;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.Single;
+import rx.Single;
 
 /**
  * Created by Gavriil Sitnikov on 05/10/2015.

src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java

@@ -25,9 +25,10 @@ import android.support.annotation.Nullable;
 import java.lang.reflect.Type;
 import java.util.concurrent.TimeUnit;
 
+import ru.touchin.roboswag.core.observables.storable.concrete.NonNullStorable;
 import ru.touchin.roboswag.core.utils.Optional;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import rx.Observable;
+import rx.Scheduler;
 
 /**
  * Created by Gavriil Sitnikov on 04/10/2015.
@@ -42,7 +43,8 @@ import io.reactivex.Scheduler;
  * @param <TObject>      Type of actual object;
  * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
  */
-public class Storable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TObject, TStoreObject, Optional<TObject>> {
+//COMPATIBILITY NOTE: in RxJava2 it should extends BaseStorable<TKey, TObject, TStoreObject, Optional<TObject>>
+public class Storable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TObject, TStoreObject, TObject> {
 
     public Storable(@NonNull final BuilderCore<TKey, TObject, TStoreObject> builderCore) {
         super(builderCore);
@@ -50,8 +52,8 @@ public class Storable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TO
 
     @NonNull
     @Override
-    public Observable<Optional<TObject>> observe() {
-        return observeOptionalValue();
+    public Observable<TObject> observe() {
+        return observeOptionalValue().map(Optional::get);
     }
 
     /**

src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java

@@ -25,8 +25,8 @@ import android.support.annotation.Nullable;
 import java.lang.reflect.Type;
 
 import ru.touchin.roboswag.core.utils.Optional;
-import io.reactivex.Completable;
-import io.reactivex.Single;
+import rx.Completable;
+import rx.Single;
 
 /**
  * Created by Gavriil Sitnikov on 04/10/2015.
@@ -67,14 +67,4 @@ public interface Store<TKey, TStoreObject> {
     @NonNull
     Single<Optional<TStoreObject>> loadObject(@NonNull Type storeObjectType, @NonNull TKey key);
 
-    /**
-     * Gets object from store by key.
-     *
-     * @param storeObjectType Type of object to store;
-     * @param key             Key related to object;
-     * @return Object from store found by key;
-     */
-    @Nullable
-    TStoreObject getObject(@NonNull Type storeObjectType, @NonNull TKey key);
-
 }

src/main/java/ru/touchin/roboswag/core/observables/storable/concrete/NonNullStorable.java

@@ -17,16 +17,19 @@
  *
  */
 
-package ru.touchin.roboswag.core.observables.storable;
+package ru.touchin.roboswag.core.observables.storable.concrete;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.concurrent.TimeUnit;
 
+import ru.touchin.roboswag.core.observables.storable.BaseStorable;
+import ru.touchin.roboswag.core.observables.storable.Migration;
+import ru.touchin.roboswag.core.observables.storable.Storable;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import rx.Observable;
+import rx.Scheduler;
 
 /**
  * Created by Gavriil Sitnikov on 04/10/2015.

src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java

@@ -23,8 +23,7 @@ import android.support.annotation.NonNull;
 
 import java.security.MessageDigest;
 
-import io.reactivex.functions.Function;
-import ru.touchin.roboswag.core.log.Lc;
+import rx.functions.Func1;
 
 /**
  * Created by Gavriil Sitnikov on 29/08/2016.
@@ -66,15 +65,11 @@ public final class StringUtils {
      * @param condition Condition of symbol;
      * @return True if some character satisfies condition.
      */
-    public static boolean containsCharLike(@NonNull final String text, @NonNull final Function<Character, Boolean> condition) {
-        try {
-            for (int i = 0; i < text.length(); i++) {
-                if (condition.apply(text.charAt(i))) {
-                    return true;
-                }
+    public static boolean containsCharLike(@NonNull final String text, @NonNull final Func1<Character, Boolean> condition) {
+        for (int i = 0; i < text.length(); i++) {
+            if (condition.call(text.charAt(i))) {
+                return true;
             }
-        } catch (final Exception exception) {
-            Lc.assertion(exception);
         }
         return false;
     }