Skip to content

Commit 30df85b

Browse files
author
Aaron Tull
committed
Renaming Observable#x to Observable#extend
1 parent 85cc639 commit 30df85b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/rx/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public interface Operator<R, T> extends Func1<Subscriber<? super R>, Subscriber<
119119
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
120120
*/
121121
@Experimental
122-
public <R> R x(Func1<? super OnSubscribe<T>, ? extends R> conversion) {
122+
public <R> R extend(Func1<? super OnSubscribe<T>, ? extends R> conversion) {
123123
return conversion.call(new OnSubscribe<T>() {
124124
@Override
125125
public void call(Subscriber<? super T> subscriber) {

src/test/java/rx/ObservableConversionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void onNext(String t) {
155155
}});
156156
List<Object> crewOfBattlestarGalactica = Arrays.asList(new Object[] {"William Adama", "Laura Roslin", "Lee Adama", new Cylon()});
157157
Observable.from(crewOfBattlestarGalactica)
158-
.x(new ConvertToCylonDetector<Object>())
158+
.extend(new ConvertToCylonDetector<Object>())
159159
.beep(new Func1<Object, Boolean>(){
160160
@Override
161161
public Boolean call(Object t) {
@@ -199,7 +199,7 @@ public Integer call(Integer k) {
199199
return i + k;
200200
}});
201201
}})
202-
.x(new Func1<OnSubscribe<Integer>, ConcurrentLinkedQueue<Integer>>() {
202+
.extend(new Func1<OnSubscribe<Integer>, ConcurrentLinkedQueue<Integer>>() {
203203
@Override
204204
public ConcurrentLinkedQueue<Integer> call(OnSubscribe<Integer> onSubscribe) {
205205
final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();

src/test/java/rx/ObservableTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ public void testForEachWithNull() {
11611161
public void testExtend() {
11621162
final TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
11631163
final Object value = new Object();
1164-
Observable.just(value).x(new Func1<OnSubscribe<Object>,Object>(){
1164+
Observable.just(value).extend(new Func1<OnSubscribe<Object>,Object>(){
11651165
@Override
11661166
public Object call(OnSubscribe<Object> onSubscribe) {
11671167
onSubscribe.call(subscriber);

0 commit comments

Comments
 (0)