Skip to content

Manual Merge of OperatorAny #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 23, 2014
Merged

Manual Merge of OperatorAny #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbaa5e0
OperatorAny
akarnokd Apr 22, 2014
61defde
Merge branch 'OperatorAny' of github.com:akarnokd/RxJava into operato…
benjchristensen Apr 23, 2014
50cef72
OperationAnyTest -> OperatorAnyTest
benjchristensen Apr 23, 2014
07542e1
Simplify Subscription Chain
benjchristensen Apr 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rxjava-core/src/main/java/rx/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
import rx.observers.SafeSubscriber;
import rx.operators.OnSubscribeFromIterable;
import rx.operators.OnSubscribeRange;
import rx.operators.OperatorAll;
import rx.operators.OperationAny;
import rx.operators.OperationAsObservable;
import rx.operators.OperationBuffer;
import rx.operators.OperationCombineLatest;
Expand Down Expand Up @@ -92,7 +90,9 @@
import rx.operators.OperationToObservableFuture;
import rx.operators.OperationUsing;
import rx.operators.OperationWindow;
import rx.operators.OperatorAll;
import rx.operators.OperatorAmb;
import rx.operators.OperatorAny;
import rx.operators.OperatorCache;
import rx.operators.OperatorCast;
import rx.operators.OperatorDoOnEach;
Expand Down Expand Up @@ -3893,7 +3893,7 @@ public final Observable<T> elementAtOrDefault(int index, T defaultValue) {
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211993.aspx">MSDN: Observable.Any (Note: the description in this page was wrong at the time of this writing)</a>
*/
public final Observable<Boolean> exists(Func1<? super T, Boolean> predicate) {
return create(OperationAny.exists(this, predicate));
return lift(new OperatorAny<T>(predicate, false));
}

/**
Expand Down Expand Up @@ -4126,7 +4126,7 @@ public final Observable<T> ignoreElements() {
* @see <a href= "http://msdn.microsoft.com/en-us/library/hh229905.aspx">MSDN: Observable.Any</a>
*/
public final Observable<Boolean> isEmpty() {
return create(OperationAny.isEmpty(this));
return lift(new OperatorAny<T>(Functions.alwaysTrue(), true));
}

/**
Expand Down
127 changes: 0 additions & 127 deletions rxjava-core/src/main/java/rx/operators/OperationAny.java
View file
Open in desktop

This file was deleted.

74 changes: 74 additions & 0 deletions rxjava-core/src/main/java/rx/operators/OperatorAny.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/**
* Copyright 2014 Netflix, Inc.
*
* 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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 rx.operators;


import rx.Observable;
import rx.Observable.Operator;
import rx.Subscriber;
import rx.functions.Func1;

/**
* Returns an {@link Observable} that emits <code>true</code> if any element of
* an observable sequence satisfies a condition, otherwise <code>false</code>.
*/
public final class OperatorAny<T> implements Operator<Boolean, T> {
private final Func1<? super T, Boolean> predicate;
private final boolean returnOnEmpty;

public OperatorAny(Func1<? super T, Boolean> predicate, boolean returnOnEmpty) {
this.predicate = predicate;
this.returnOnEmpty = returnOnEmpty;
}

@Override
public Subscriber<? super T> call(final Subscriber<? super Boolean> child) {
return new Subscriber<T>(child) {
boolean hasElements;
boolean done;
@Override
public void onNext(T t) {
hasElements = true;
boolean result = predicate.call(t);
if (result && !done) {
done = true;
child.onNext(!returnOnEmpty);
child.onCompleted();
unsubscribe();
}
}

@Override
public void onError(Throwable e) {
child.onError(e);
}

@Override
public void onCompleted() {
if (!done) {
done = true;
if (hasElements) {
child.onNext(false);
} else {
child.onNext(returnOnEmpty);
}
child.onCompleted();
}
}

};
}
}
34 changes: 16 additions & 18 deletions ...t/java/rx/operators/OperationAnyTest.java → ...st/java/rx/operators/OperatorAnyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,20 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static rx.operators.OperationAny.any;
import static rx.operators.OperationAny.exists;
import static rx.operators.OperationAny.isEmpty;

import org.junit.Test;

import rx.Observable;
import rx.Observer;
import rx.functions.Func1;
import rx.functions.Functions;

public class OperationAnyTest {
public class OperatorAnyTest {

@Test
public void testAnyWithTwoItems() {
Observable<Integer> w = Observable.from(1, 2);
Observable<Boolean> observable = Observable.create(any(w));
Observable<Boolean> observable = w.exists(Functions.alwaysTrue());

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -48,7 +46,7 @@ public void testAnyWithTwoItems() {
@Test
public void testIsEmptyWithTwoItems() {
Observable<Integer> w = Observable.from(1, 2);
Observable<Boolean> observable = Observable.create(isEmpty(w));
Observable<Boolean> observable = w.isEmpty();

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -62,7 +60,7 @@ public void testIsEmptyWithTwoItems() {
@Test
public void testAnyWithOneItem() {
Observable<Integer> w = Observable.from(1);
Observable<Boolean> observable = Observable.create(any(w));
Observable<Boolean> observable = w.exists(Functions.alwaysTrue());

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -76,7 +74,7 @@ public void testAnyWithOneItem() {
@Test
public void testIsEmptyWithOneItem() {
Observable<Integer> w = Observable.from(1);
Observable<Boolean> observable = Observable.create(isEmpty(w));
Observable<Boolean> observable = w.isEmpty();

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -90,7 +88,7 @@ public void testIsEmptyWithOneItem() {
@Test
public void testAnyWithEmpty() {
Observable<Integer> w = Observable.empty();
Observable<Boolean> observable = Observable.create(any(w));
Observable<Boolean> observable = w.exists(Functions.alwaysTrue());

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -104,7 +102,7 @@ public void testAnyWithEmpty() {
@Test
public void testIsEmptyWithEmpty() {
Observable<Integer> w = Observable.empty();
Observable<Boolean> observable = Observable.create(isEmpty(w));
Observable<Boolean> observable = w.isEmpty();

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -118,14 +116,14 @@ public void testIsEmptyWithEmpty() {
@Test
public void testAnyWithPredicate1() {
Observable<Integer> w = Observable.from(1, 2, 3);
Observable<Boolean> observable = Observable.create(any(w,
Observable<Boolean> observable = w.exists(
new Func1<Integer, Boolean>() {

@Override
public Boolean call(Integer t1) {
return t1 < 2;
}
}));
});

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -139,14 +137,14 @@ public Boolean call(Integer t1) {
@Test
public void testExists1() {
Observable<Integer> w = Observable.from(1, 2, 3);
Observable<Boolean> observable = Observable.create(exists(w,
Observable<Boolean> observable = w.exists(
new Func1<Integer, Boolean>() {

@Override
public Boolean call(Integer t1) {
return t1 < 2;
}
}));
});

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -160,14 +158,14 @@ public Boolean call(Integer t1) {
@Test
public void testAnyWithPredicate2() {
Observable<Integer> w = Observable.from(1, 2, 3);
Observable<Boolean> observable = Observable.create(any(w,
Observable<Boolean> observable = w.exists(
new Func1<Integer, Boolean>() {

@Override
public Boolean call(Integer t1) {
return t1 < 1;
}
}));
});

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand All @@ -182,14 +180,14 @@ public Boolean call(Integer t1) {
public void testAnyWithEmptyAndPredicate() {
// If the source is empty, always output false.
Observable<Integer> w = Observable.empty();
Observable<Boolean> observable = Observable.create(any(w,
Observable<Boolean> observable = w.exists(
new Func1<Integer, Boolean>() {

@Override
public Boolean call(Integer t1) {
return true;
}
}));
});

@SuppressWarnings("unchecked")
Observer<Boolean> observer = mock(Observer.class);
Expand Down