Skip to content

Commit 4f841d9

Browse files
benjchristensenbenjchristensen
committed
Merge pull request #891 from benjchristensen/rx-util
Eliminate rx.util.* dumping grounds
2 parents ad6c70b + f4c83f4 commit 4f841d9

File tree

322 files changed

+2150
-738
lines changed

Some content is hidden

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

322 files changed

+2150
-738
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
; If they want Func1, give them onSubscribe as well so Observable/create can be
2121
; used seemlessly with rx/fn.
2222
; TODO remove this when OnSubscriberFunc is removed
23-
~@(if (and (= prefix "rx.util.functions.Func")
23+
~@(if (and (= prefix "rx.functions.Func")
2424
(some #{1} arities))
2525
`(rx.Observable$OnSubscribeFunc
2626
(~'onSubscribe [~'this observer#]
2727
(~f-name observer#))))
2828

2929
; OnSubscribe is just an Action1, so add it to the list of implemented interfaces
3030
; so an action cab be used with Observable/create
31-
~@(if (and (= prefix "rx.util.functions.Action")
31+
~@(if (and (= prefix "rx.functions.Action")
3232
(some #{1} arities))
3333
`(rx.Observable$OnSubscribe))
3434

@@ -41,7 +41,7 @@
4141
arities) ))))
4242

4343
(defn fn*
44-
"Given function f, returns an object that implements rx.util.functions.Func0-9
44+
"Given function f, returns an object that implements rx.functions.Func0-9
4545
by delegating the call() method to the given function.
4646
4747
If the f has the wrong arity, an ArityException will be thrown at runtime.
@@ -55,28 +55,28 @@
5555
(.reduce my-numbers (rx/fn* +))
5656
5757
See:
58-
http://netflix.github.io/RxJava/javadoc/rx/util/functions/Func0.html
58+
http://netflix.github.io/RxJava/javadoc/rx/functions/Func0.html
5959
"
6060
[f]
61-
(reify-callable "rx.util.functions.Func" [0 1 2 3 4 5 6 7 8 9] f))
61+
(reify-callable "rx.functions.Func" [0 1 2 3 4 5 6 7 8 9] f))
6262

6363
(defn fnN*
64-
"Given function f, returns an object that implements rx.util.functions.FuncN
64+
"Given function f, returns an object that implements rx.functions.FuncN
6565
by delegating to the given function.
6666
6767
Unfortunately, this can't be included in fn* because of ambiguities between
6868
the single arg call() method and the var args call method.
6969
7070
See:
71-
http://netflix.github.io/RxJava/javadoc/rx/util/functions/FuncN.html
71+
http://netflix.github.io/RxJava/javadoc/rx/functions/FuncN.html
7272
"
7373
[f]
74-
(reify rx.util.functions.FuncN
74+
(reify rx.functions.FuncN
7575
(call [this objects]
7676
(apply f objects))))
7777

7878
(defmacro fn
79-
"Like clojure.core/fn, but returns the appropriate rx.util.functions.Func*
79+
"Like clojure.core/fn, but returns the appropriate rx.functions.Func*
8080
interface.
8181
8282
Example:
@@ -100,7 +100,7 @@
100100
(meta &form)))
101101

102102
(defn action*
103-
"Given function f, returns an object that implements rx.util.functions.Action0-3
103+
"Given function f, returns an object that implements rx.functions.Action0-3
104104
by delegating to the given function. Also implements rx.Observable$OnSubscribe which
105105
is just an Action1.
106106
@@ -109,13 +109,13 @@
109109
(.subscribe my-observable (rx/action* println))
110110
111111
See:
112-
http://netflix.github.io/RxJava/javadoc/rx/util/functions/Action0.html
112+
http://netflix.github.io/RxJava/javadoc/rx/functions/Action0.html
113113
"
114114
[f]
115-
(reify-callable "rx.util.functions.Action" [0 1 2 3] f))
115+
(reify-callable "rx.functions.Action" [0 1 2 3] f))
116116

117117
(defmacro action
118-
"Like clojure.core/fn, but returns the appropriate rx.util.functions.Action*
118+
"Like clojure.core/fn, but returns the appropriate rx.functions.Action*
119119
interface.
120120
121121
Example:

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

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

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

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

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

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

4242
}

‎language-adaptors/rxjava-clojure/src/test/clojure/rx/lang/clojure/interop_test.clj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
(testing "implements Func0-9"
1010
(let [f (rx/fn* vector)]
1111
(is (instance? rx.Observable$OnSubscribeFunc f))
12-
(is (instance? rx.util.functions.Func0 f))
13-
(is (instance? rx.util.functions.Func1 f))
14-
(is (instance? rx.util.functions.Func2 f))
15-
(is (instance? rx.util.functions.Func3 f))
16-
(is (instance? rx.util.functions.Func4 f))
17-
(is (instance? rx.util.functions.Func5 f))
18-
(is (instance? rx.util.functions.Func6 f))
19-
(is (instance? rx.util.functions.Func7 f))
20-
(is (instance? rx.util.functions.Func8 f))
21-
(is (instance? rx.util.functions.Func9 f))
12+
(is (instance? rx.functions.Func0 f))
13+
(is (instance? rx.functions.Func1 f))
14+
(is (instance? rx.functions.Func2 f))
15+
(is (instance? rx.functions.Func3 f))
16+
(is (instance? rx.functions.Func4 f))
17+
(is (instance? rx.functions.Func5 f))
18+
(is (instance? rx.functions.Func6 f))
19+
(is (instance? rx.functions.Func7 f))
20+
(is (instance? rx.functions.Func8 f))
21+
(is (instance? rx.functions.Func9 f))
2222
(is (= [] (.call f)))
2323
(is (= [1] (.call f 1)))
2424
(is (= [1 2] (.call f 1 2)))
@@ -35,12 +35,12 @@
3535
; No type hint, picks Object overload
3636
(is (= "Object"
3737
(.call dummy (rx/fn* +))))
38-
(is (= "rx.util.functions.Func1"
38+
(is (= "rx.functions.Func1"
3939
(.call dummy
40-
^rx.util.functions.Func1 (rx/fn* +))))
41-
(is (= "rx.util.functions.Func2"
40+
^rx.functions.Func1 (rx/fn* +))))
41+
(is (= "rx.functions.Func2"
4242
(.call dummy
43-
^rx.util.functions.Func2 (rx/fn* *)))))))
43+
^rx.functions.Func2 (rx/fn* *)))))))
4444

4545
(deftest test-fn
4646
(testing "makes appropriate Func*"
@@ -53,12 +53,12 @@
5353
(is (= "Object"
5454
(.call dummy
5555
(rx/fn [a] a))))
56-
(is (= "rx.util.functions.Func1"
56+
(is (= "rx.functions.Func1"
5757
(.call dummy
58-
^rx.util.functions.Func1 (rx/fn [a] a))))
59-
(is (= "rx.util.functions.Func2"
58+
^rx.functions.Func1 (rx/fn [a] a))))
59+
(is (= "rx.functions.Func2"
6060
(.call dummy
61-
^rx.util.functions.Func2 (rx/fn [a b] (* a b))))))))
61+
^rx.functions.Func2 (rx/fn [a b] (* a b))))))))
6262

6363

6464
(deftest test-fnN*
@@ -71,10 +71,10 @@
7171
(let [calls (atom [])
7272
a (rx/action* #(swap! calls conj (vec %&)))]
7373
(is (instance? rx.Observable$OnSubscribe a))
74-
(is (instance? rx.util.functions.Action0 a))
75-
(is (instance? rx.util.functions.Action1 a))
76-
(is (instance? rx.util.functions.Action2 a))
77-
(is (instance? rx.util.functions.Action3 a))
74+
(is (instance? rx.functions.Action0 a))
75+
(is (instance? rx.functions.Action1 a))
76+
(is (instance? rx.functions.Action2 a))
77+
(is (instance? rx.functions.Action3 a))
7878
(.call a)
7979
(.call a 1)
8080
(.call a 1 2)
@@ -86,12 +86,12 @@
8686
(is (= "Object"
8787
(.call dummy
8888
(rx/action* println))))
89-
(is (= "rx.util.functions.Action1"
89+
(is (= "rx.functions.Action1"
9090
(.call dummy
91-
^rx.util.functions.Action1 (rx/action* println))))
92-
(is (= "rx.util.functions.Action2"
91+
^rx.functions.Action1 (rx/action* println))))
92+
(is (= "rx.functions.Action2"
9393
(.call dummy
94-
^rx.util.functions.Action2 (rx/action* prn)))))))
94+
^rx.functions.Action2 (rx/action* prn)))))))
9595

9696
(deftest test-action
9797
(testing "makes appropriate Action*"
@@ -106,12 +106,12 @@
106106
(is (= "Object"
107107
(.call dummy
108108
(rx/action [a] a))))
109-
(is (= "rx.util.functions.Action1"
109+
(is (= "rx.functions.Action1"
110110
(.call dummy
111-
^rx.util.functions.Action1 (rx/action [a] a))))
112-
(is (= "rx.util.functions.Action2"
111+
^rx.functions.Action1 (rx/action [a] a))))
112+
(is (= "rx.functions.Action2"
113113
(.call dummy
114-
^rx.util.functions.Action2 (rx/action [a b] (* a b))))))))
114+
^rx.functions.Action2 (rx/action [a b] (* a b))))))))
115115

116116
(deftest test-basic-usage
117117

‎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}.

0 commit comments

Comments
 (0)