Skip to content
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.

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

OperatorDefaultIfEmpty #1080

Merged
merged 1 commit into from
Apr 24, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rxjava-core/src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import rx.operators.OperationCombineLatest;
import rx.operators.OperationConcat;
import rx.operators.OperationDebounce;
import rx.operators.OperationDefaultIfEmpty;
import rx.operators.OperationDefer;
import rx.operators.OperationDelay;
import rx.operators.OperationDematerialize;
Expand Down Expand Up @@ -95,6 +94,7 @@
import rx.operators.OperatorAsObservable;
import rx.operators.OperatorCache;
import rx.operators.OperatorCast;
import rx.operators.OperatorDefaultIfEmpty;
import rx.operators.OperatorDoOnEach;
import rx.operators.OperatorElementAt;
import rx.operators.OperatorFilter;
Expand Down Expand Up @@ -3450,7 +3450,7 @@ public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler sched
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229624.aspx">MSDN: Observable.DefaultIfEmpty</a>
*/
public final Observable<T> defaultIfEmpty(T defaultValue) {
return create(OperationDefaultIfEmpty.defaultIfEmpty(this, defaultValue));
return lift(new OperatorDefaultIfEmpty<T>(defaultValue));
}

/**
Expand Down

This file was deleted.

64 changes: 64 additions & 0 deletions rxjava-core/src/main/java/rx/operators/OperatorDefaultIfEmpty.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* 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.Operator;
import rx.Subscriber;

/**
* Returns the elements of the specified sequence or the specified default value
* in a singleton sequence if the sequence is empty.
* @param <T> the value type
*/
public class OperatorDefaultIfEmpty<T> implements Operator<T, T> {
final T defaultValue;

public OperatorDefaultIfEmpty(T defaultValue) {
this.defaultValue = defaultValue;
}

@Override
public Subscriber<? super T> call(final Subscriber<? super T> child) {
return new Subscriber<T>(child) {
boolean hasValue;
@Override
public void onNext(T t) {
hasValue = true;
child.onNext(t);
}

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

@Override
public void onCompleted() {
if (!hasValue) {
try {
child.onNext(defaultValue);
} catch (Throwable e) {
child.onError(e);
return;
}
}
child.onCompleted();
}

};
}

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/**
* 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 static org.mockito.Mockito.*;

import org.junit.Test;

import rx.Observable;
import rx.Observer;
import rx.Subscriber;

public class OperatorDefaultIfEmptyTest {

@Test
public void testDefaultIfEmpty() {
Observable<Integer> source = Observable.from(1, 2, 3);
Observable<Integer> observable = source.defaultIfEmpty(10);

@SuppressWarnings("unchecked")
Observer<Integer> observer = mock(Observer.class);
observable.subscribe(observer);
verify(observer, never()).onNext(10);
verify(observer).onNext(1);
verify(observer).onNext(2);
verify(observer).onNext(3);
verify(observer).onCompleted();
verify(observer, never()).onError(any(Throwable.class));
}

@Test
public void testDefaultIfEmptyWithEmpty() {
Observable<Integer> source = Observable.empty();
Observable<Integer> observable = source.defaultIfEmpty(10);

@SuppressWarnings("unchecked")
Observer<Integer> observer = mock(Observer.class);
observable.subscribe(observer);

verify(observer).onNext(10);
verify(observer).onCompleted();
verify(observer, never()).onError(any(Throwable.class));
}

@Test
public void testEmptyButClientThrows() {
final Observer<Integer> o = mock(Observer.class);

Observable.<Integer>empty().defaultIfEmpty(1).subscribe(new Subscriber<Integer>() {
@Override
public void onNext(Integer t) {
throw new OperationReduceTest.CustomException();
}

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

@Override
public void onCompleted() {
o.onCompleted();
}
});

verify(o).onError(any(OperationReduceTest.CustomException.class));
verify(o, never()).onNext(any(Integer.class));
verify(o, never()).onCompleted();
}
}