More accurate name for operator which unsubscribes on first emission

rchodava · Oct 6, 2016 · 6cb25b7 · 6cb25b7
1 parent a2cc032
commit 6cb25b7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/foundation/stack/datamill/db/DatabaseClient.java b/core/src/main/java/foundation/stack/datamill/db/DatabaseClient.java
@@ -4,7 +4,7 @@
 import foundation.stack.datamill.configuration.Named;
 import foundation.stack.datamill.db.impl.QueryBuilderImpl;
 import foundation.stack.datamill.db.impl.RowImpl;
-import foundation.stack.datamill.db.impl.UnsubscribeOnCompletedOperator;
+import foundation.stack.datamill.db.impl.UnsubscribeOnNextOperator;
 import org.flywaydb.core.Flyway;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -204,7 +204,7 @@ public <T> Observable<List<T>> getAs(Func1<Row, T> transformer) {
 
         @Override
         public <T> Observable<T> firstAs(Func1<Row, T> transformer) {
-            return stream().map(transformer).take(1).lift(new UnsubscribeOnCompletedOperator<>());
+            return stream().map(transformer).take(1).lift(new UnsubscribeOnNextOperator<>());
         }
 
         @Override

diff --git a/.../impl/UnsubscribeOnCompletedOperator.java → ...ll/db/impl/UnsubscribeOnNextOperator.java b/.../impl/UnsubscribeOnCompletedOperator.java → ...ll/db/impl/UnsubscribeOnNextOperator.java
@@ -9,7 +9,7 @@
 /**
  * @author Ravi Chodavarapu (rchodava@gmail.com)
  */
-public class UnsubscribeOnCompletedOperator<T> implements Observable.Operator<T, T> {
+public class UnsubscribeOnNextOperator<T> implements Observable.Operator<T, T> {
     private final AtomicBoolean completed = new AtomicBoolean();
 
     @Override

diff --git a/core/src/main/java/foundation/stack/datamill/db/test/TestDatabaseClient.java b/core/src/main/java/foundation/stack/datamill/db/test/TestDatabaseClient.java
@@ -4,7 +4,7 @@
 import foundation.stack.datamill.db.ResultBuilder;
 import foundation.stack.datamill.db.Row;
 import foundation.stack.datamill.db.UpdateQueryExecution;
-import foundation.stack.datamill.db.impl.UnsubscribeOnCompletedOperator;
+import foundation.stack.datamill.db.impl.UnsubscribeOnNextOperator;
 import rx.Observable;
 import rx.functions.Func1;
 
@@ -59,7 +59,7 @@ public <T> Observable<List<T>> getAs(Func1<Row, T> transformer) {
 
             @Override
             public <T> Observable<T> firstAs(Func1<Row, T> transformer) {
-                return stream().map(transformer).take(1).lift(new UnsubscribeOnCompletedOperator<>());
+                return stream().map(transformer).take(1).lift(new UnsubscribeOnNextOperator<>());
             }
 
             @Override

diff --git a/...l/UnsubscribeOnCompletedOperatorTest.java → ...b/impl/UnsubscribeOnNextOperatorTest.java b/...l/UnsubscribeOnCompletedOperatorTest.java → ...b/impl/UnsubscribeOnNextOperatorTest.java
@@ -8,13 +8,13 @@
 /**
  * @author Ravi Chodavarapu (rchodava@gmail.com)
  */
-public class UnsubscribeOnCompletedOperatorTest {
+public class UnsubscribeOnNextOperatorTest {
     @Test
     public void operator() {
         int[] unsubscribed = new int[] { 1 };
         int result = Observable.just(1, 2, 3)
                 .doOnUnsubscribe(() -> unsubscribed[0] = unsubscribed[0] + 10)
-                .lift(new UnsubscribeOnCompletedOperator<>())
+                .lift(new UnsubscribeOnNextOperator<>())
                 .doOnUnsubscribe(() -> unsubscribed[0] = unsubscribed[0] * 2)
                 .toBlocking()
                 .lastOrDefault(0);