Skip to content

Renaming Observable#x to Observable#extend #3423

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

Merged
merged 1 commit into from
Oct 8, 2015
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
2 changes: 1 addition & 1 deletion src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public interface Operator<R, T> extends Func1<Subscriber<? super R>, Subscriber<
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
public <R> R x(Func1<? super OnSubscribe<T>, ? extends R> conversion) {
public <R> R extend(Func1<? super OnSubscribe<T>, ? extends R> conversion) {
return conversion.call(new OnSubscribe<T>() {
@Override
public void call(Subscriber<? super T> subscriber) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/rx/ObservableConversionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void onNext(String t) {
}});
List<Object> crewOfBattlestarGalactica = Arrays.asList(new Object[] {"William Adama", "Laura Roslin", "Lee Adama", new Cylon()});
Observable.from(crewOfBattlestarGalactica)
.x(new ConvertToCylonDetector<Object>())
.extend(new ConvertToCylonDetector<Object>())
.beep(new Func1<Object, Boolean>(){
@Override
public Boolean call(Object t) {
Expand Down Expand Up @@ -199,7 +199,7 @@ public Integer call(Integer k) {
return i + k;
}});
}})
.x(new Func1<OnSubscribe<Integer>, ConcurrentLinkedQueue<Integer>>() {
.extend(new Func1<OnSubscribe<Integer>, ConcurrentLinkedQueue<Integer>>() {
@Override
public ConcurrentLinkedQueue<Integer> call(OnSubscribe<Integer> onSubscribe) {
final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/rx/ObservableTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ public void testForEachWithNull() {
public void testExtend() {
final TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
final Object value = new Object();
Observable.just(value).x(new Func1<OnSubscribe<Object>,Object>(){
Observable.just(value).extend(new Func1<OnSubscribe<Object>,Object>(){
@Override
public Object call(OnSubscribe<Object> onSubscribe) {
onSubscribe.call(subscriber);
Expand Down