Skip to content

Commit 1d3d3a9

Browse files
Move rx.util.functions to rx.functions
Eliminate dumping ground of rx.util
1 parent 9840ce8 commit 1d3d3a9

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/main/java/rx/operators/DebugSubscriber.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import rx.Observable.Operator;
44
import rx.Observer;
55
import rx.Subscriber;
6+
import rx.functions.Action1;
7+
import rx.functions.Func1;
68
import rx.plugins.DebugNotification;
7-
import rx.util.functions.Action1;
8-
import rx.util.functions.Func1;
99

1010
public final class DebugSubscriber<T> extends Subscriber<T> {
1111
private final Func1<T, T> onNextHook;

src/main/java/rx/plugins/DebugHook.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import rx.Observable.Operator;
66
import rx.Subscriber;
77
import rx.Subscription;
8+
import rx.functions.Action1;
9+
import rx.functions.Actions;
10+
import rx.functions.Func1;
11+
import rx.functions.Functions;
812
import rx.operators.DebugSubscriber;
9-
import rx.util.functions.Action1;
10-
import rx.util.functions.Actions;
11-
import rx.util.functions.Func1;
12-
import rx.util.functions.Functions;
1313

1414
/**
1515
* Implements hooks into the {@link Observable} chain to emit a detailed account of all the events

src/test/java/rx/debug/DebugHookTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import rx.Notification;
1616
import rx.Observable;
1717
import rx.Observer;
18+
import rx.functions.Action1;
19+
import rx.functions.Func1;
1820
import rx.plugins.DebugHook;
1921
import rx.plugins.DebugNotification;
2022
import rx.plugins.PlugReset;
2123
import rx.plugins.RxJavaPlugins;
22-
import rx.util.functions.Action1;
23-
import rx.util.functions.Func1;
2424

2525
public class DebugHookTest {
2626
@Before

0 commit comments

Comments
 (0)