Skip to content

Commit c20c01e

Browse files
benjchristensenbenjchristensen
committed
Move rx.util.functions to rx.functions
Eliminate dumping ground of rx.util
1 parent 8b928a8 commit c20c01e

File tree

268 files changed

+582
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+582
-581
lines changed

‎language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/interop/DummyObservable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ public String call(Object f) {
2323
return "Object";
2424
}
2525

26-
public String call(rx.util.functions.Func1 f) {
26+
public String call(rx.functions.Func1 f) {
2727
return "rx.util.functions.Func1";
2828
}
2929

30-
public String call(rx.util.functions.Func2 f) {
30+
public String call(rx.functions.Func2 f) {
3131
return "rx.util.functions.Func2";
3232
}
3333

34-
public String call(rx.util.functions.Action1 f) {
34+
public String call(rx.functions.Action1 f) {
3535
return "rx.util.functions.Action1";
3636
}
3737

38-
public String call(rx.util.functions.Action2 f) {
38+
public String call(rx.functions.Action2 f) {
3939
return "rx.util.functions.Action2";
4040
}
4141

‎language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/RxExamples.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import rx.Observable;
1919
import rx.Observer;
2020
import rx.Subscription;
2121
import rx.subscriptions.Subscriptions;
22-
import rx.util.functions.Action0
23-
import rx.util.functions.Func1;
22+
import rx.functions.Action0
23+
import rx.functions.Func1;
2424

2525
// --------------------------------------------------
2626
// Hello World!

‎language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/VideoExample.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import rx.Observable;
1919
import rx.Observer;
2020
import rx.Subscription;
2121
import rx.subscriptions.BooleanSubscription;
22-
import rx.util.functions.Func1;
22+
import rx.functions.Func1;
2323
import java.util.concurrent.ExecutorService;
2424
import java.util.concurrent.LinkedBlockingQueue;
2525
import java.util.concurrent.ThreadPoolExecutor;

‎language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyActionWrapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
package rx.lang.groovy;
1717

1818
import groovy.lang.Closure;
19-
import rx.util.functions.Action;
20-
import rx.util.functions.Action0;
21-
import rx.util.functions.Action1;
22-
import rx.util.functions.Action2;
23-
import rx.util.functions.Action3;
19+
import rx.functions.Action;
20+
import rx.functions.Action0;
21+
import rx.functions.Action1;
22+
import rx.functions.Action2;
23+
import rx.functions.Action3;
2424

2525
/**
2626
* Concrete wrapper that accepts a {@link Closure} and produces any needed Rx {@link Action}.

‎language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyFunctionWrapper.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
package rx.lang.groovy;
1717

1818
import groovy.lang.Closure;
19-
import rx.util.functions.Func0;
20-
import rx.util.functions.Func1;
21-
import rx.util.functions.Func2;
22-
import rx.util.functions.Func3;
23-
import rx.util.functions.Func4;
24-
import rx.util.functions.Func5;
25-
import rx.util.functions.Func6;
26-
import rx.util.functions.Func7;
27-
import rx.util.functions.Func8;
28-
import rx.util.functions.Func9;
29-
import rx.util.functions.FuncN;
30-
import rx.util.functions.Function;
19+
import rx.functions.Func0;
20+
import rx.functions.Func1;
21+
import rx.functions.Func2;
22+
import rx.functions.Func3;
23+
import rx.functions.Func4;
24+
import rx.functions.Func5;
25+
import rx.functions.Func6;
26+
import rx.functions.Func7;
27+
import rx.functions.Func8;
28+
import rx.functions.Func9;
29+
import rx.functions.FuncN;
30+
import rx.functions.Function;
3131

3232
/**
3333
* Concrete wrapper that accepts a {@link Closure} and produces any needed Rx {@link Function}.

‎language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/RxGroovyExtensionModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
import rx.Observable;
3131
import rx.Observable.OnSubscribeFunc;
32+
import rx.functions.Action;
33+
import rx.functions.Function;
3234
import rx.observables.BlockingObservable;
33-
import rx.util.functions.Action;
34-
import rx.util.functions.Function;
3535

3636
/**
3737
* ExtensionModule that adds extension methods to support groovy.lang.Closure

‎language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/TestParallel.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.junit.Test
2020
import rx.Observable
2121
import rx.Scheduler
2222
import rx.schedulers.Schedulers
23-
import rx.util.functions.Func1
23+
import rx.functions.Func1
2424

2525
class TestParallel {
2626

‎language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyActionWrapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.jruby.runtime.ThreadContext;
2222
import org.jruby.runtime.builtin.IRubyObject;
2323

24-
import rx.util.functions.Action;
25-
import rx.util.functions.Action0;
26-
import rx.util.functions.Action1;
27-
import rx.util.functions.Action2;
28-
import rx.util.functions.Action3;
24+
import rx.functions.Action;
25+
import rx.functions.Action0;
26+
import rx.functions.Action1;
27+
import rx.functions.Action2;
28+
import rx.functions.Action3;
2929

3030
/**
3131
* Concrete wrapper that accepts a {@link RubyProc} and produces any needed Rx {@link Action}.

‎language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyFunctionWrapper.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
import org.jruby.runtime.ThreadContext;
2222
import org.jruby.runtime.builtin.IRubyObject;
2323

24-
import rx.util.functions.Func0;
25-
import rx.util.functions.Func1;
26-
import rx.util.functions.Func2;
27-
import rx.util.functions.Func3;
28-
import rx.util.functions.Func4;
29-
import rx.util.functions.Func5;
30-
import rx.util.functions.Func6;
31-
import rx.util.functions.Func7;
32-
import rx.util.functions.Func8;
33-
import rx.util.functions.Func9;
34-
import rx.util.functions.FuncN;
35-
import rx.util.functions.Function;
24+
import rx.functions.Func0;
25+
import rx.functions.Func1;
26+
import rx.functions.Func2;
27+
import rx.functions.Func3;
28+
import rx.functions.Func4;
29+
import rx.functions.Func5;
30+
import rx.functions.Func6;
31+
import rx.functions.Func7;
32+
import rx.functions.Func8;
33+
import rx.functions.Func9;
34+
import rx.functions.FuncN;
35+
import rx.functions.Function;
3636

3737
/**
3838
* Concrete wrapper that accepts a {@link RubyProc} and produces any needed Rx {@link Function}.

‎language-adaptors/rxjava-scala/src/examples/java/rx/lang/scala/examples/MovieLibUsage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package rx.lang.scala.examples;
1717

1818
import rx.Observable;
19+
import rx.functions.Action1;
1920
import rx.lang.scala.examples.Movie;
2021
import rx.lang.scala.examples.MovieLib;
21-
import rx.util.functions.Action1;
2222
import static rx.lang.scala.JavaConversions.toScalaObservable;
2323

2424
public class MovieLibUsage {

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import rx.Scheduler;
2121
import rx.Subscription;
22+
import rx.functions.Action1;
2223
import rx.subscriptions.BooleanSubscription;
23-
import rx.util.functions.Action1;
2424
import android.os.Handler;
2525

2626
/**
@@ -41,9 +41,9 @@ public HandlerThreadScheduler(Handler handler) {
4141
}
4242

4343
/**
44-
* Calls {@link HandlerThreadScheduler#schedule(Object, rx.util.functions.Func2, long, java.util.concurrent.TimeUnit)} with a delay of zero milliseconds.
44+
* Calls {@link HandlerThreadScheduler#schedule(Object, rx.functions.Func2, long, java.util.concurrent.TimeUnit)} with a delay of zero milliseconds.
4545
*
46-
* See {@link #schedule(Object, rx.util.functions.Func2, long, java.util.concurrent.TimeUnit)}
46+
* See {@link #schedule(Object, rx.functions.Func2, long, java.util.concurrent.TimeUnit)}
4747
*/
4848
@Override
4949
public Subscription schedule(Action1<Inner> action) {

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperationObserveFromAndroidComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import rx.Subscription;
2121
import rx.Scheduler.Inner;
2222
import rx.android.schedulers.AndroidSchedulers;
23+
import rx.functions.Action0;
24+
import rx.functions.Action1;
2325
import rx.subscriptions.Subscriptions;
24-
import rx.util.functions.Action0;
25-
import rx.util.functions.Action1;
2626
import android.app.Activity;
2727
import android.os.Looper;
2828
import android.util.Log;

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorCompoundButtonInput.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import rx.Scheduler.Inner;
2727
import rx.android.observables.ViewObservable;
2828
import rx.android.schedulers.AndroidSchedulers;
29+
import rx.functions.Action0;
30+
import rx.functions.Action1;
2931
import rx.subscriptions.Subscriptions;
30-
import rx.util.functions.Action0;
31-
import rx.util.functions.Action1;
3232
import android.view.View;
3333
import android.widget.CompoundButton;
3434

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorEditTextInput.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import rx.Scheduler.Inner;
2222
import rx.android.observables.ViewObservable;
2323
import rx.android.schedulers.AndroidSchedulers;
24+
import rx.functions.Action0;
25+
import rx.functions.Action1;
2426
import rx.subscriptions.Subscriptions;
25-
import rx.util.functions.Action0;
26-
import rx.util.functions.Action1;
2727
import android.text.Editable;
2828
import android.text.TextWatcher;
2929
import android.widget.EditText;

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorViewClick.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import rx.Subscription;
2727
import rx.android.observables.ViewObservable;
2828
import rx.android.schedulers.AndroidSchedulers;
29+
import rx.functions.Action0;
30+
import rx.functions.Action1;
2931
import rx.subscriptions.Subscriptions;
30-
import rx.util.functions.Action0;
31-
import rx.util.functions.Action1;
3232
import android.view.View;
3333

3434
public final class OperatorViewClick implements Observable.OnSubscribe<View> {

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperationObserveFromAndroidComponentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
import rx.Observer;
4343
import rx.Subscription;
4444
import rx.android.schedulers.AndroidSchedulers;
45+
import rx.functions.Action1;
4546
import rx.observers.TestObserver;
4647
import rx.observers.TestSubscriber;
4748
import rx.operators.OperationObserveFromAndroidComponent;
4849
import rx.schedulers.Schedulers;
4950
import rx.subjects.PublishSubject;
5051
import rx.subscriptions.BooleanSubscription;
51-
import rx.util.functions.Action1;
5252
import android.app.Activity;
5353
import android.app.Fragment;
5454

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import rx.Scheduler;
3030
import rx.Scheduler.Inner;
3131
import rx.Subscription;
32-
import rx.util.functions.Action1;
33-
import rx.util.functions.Func2;
32+
import rx.functions.Action1;
33+
import rx.functions.Func2;
3434
import android.os.Handler;
3535

3636
@RunWith(RobolectricTestRunner.class)

‎rxjava-contrib/rxjava-apache-http/src/test/java/rx/apache/http/examples/ExampleObservableHttp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import rx.Observable;
2727
import rx.apache.http.ObservableHttp;
2828
import rx.apache.http.ObservableHttpResponse;
29-
import rx.util.functions.Action1;
30-
import rx.util.functions.Func1;
29+
import rx.functions.Action1;
30+
import rx.functions.Func1;
3131

3232
public class ExampleObservableHttp {
3333

0 commit comments

Comments
 (0)