Skip to content

Commit a1a1469

Browse files
benjchristensenbenjchristensen
committed
removing .observables package so main classes are just rx.*
1 parent ca9d482 commit a1a1469

37 files changed

+135
-135
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.mockito.Mock;
2323
import org.mockito.MockitoAnnotations;
2424

25-
import rx.observables.Observer;
25+
import rx.Observer;
2626
import rx.util.functions.FunctionLanguageAdaptor;
2727

2828
import clojure.lang.IFn;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import org.mockito.Mock;
3030
import org.mockito.MockitoAnnotations;
3131

32-
import rx.observables.Notification;
33-
import rx.observables.Observable;
34-
import rx.observables.Observer;
35-
import rx.observables.Subscription;
32+
import rx.Notification;
33+
import rx.Observable;
34+
import rx.Observer;
35+
import rx.Subscription;
3636
import rx.util.functions.Func1;
3737
import rx.util.functions.FunctionLanguageAdaptor;
3838

@@ -210,7 +210,7 @@ private void runGroovyScript(String script) {
210210
Binding binding = new Binding();
211211
binding.setVariable("mockApiCall", new TestFactory());
212212
binding.setVariable("a", assertion);
213-
binding.setVariable("o", rx.observables.Observable.class);
213+
binding.setVariable("o", rx.Observable.class);
214214

215215
/* parse the script and execute it */
216216
InvokerHelper.createScript(loader.parseClass(script), binding).run();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import org.mockito.Mock;
3131
import org.mockito.MockitoAnnotations;
3232

33-
import rx.observables.Notification;
34-
import rx.observables.Observable;
35-
import rx.observables.Observer;
36-
import rx.observables.Subscription;
33+
import rx.Notification;
34+
import rx.Observable;
35+
import rx.Observer;
36+
import rx.Subscription;
3737
import rx.util.functions.Func1;
3838
import rx.util.functions.FunctionLanguageAdaptor;
3939

rxjava-core/src/main/java/rx/observables/Notification.java renamed to rxjava-core/src/main/java/rx/Notification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables;
16+
package rx;
1717

1818
/**
1919
* An object representing a notification sent to a Observable.

rxjava-core/src/main/java/rx/observables/Observable.java renamed to rxjava-core/src/main/java/rx/Observable.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables;
16+
package rx;
1717

1818
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;
@@ -32,25 +32,25 @@
3232
import org.mockito.Mockito;
3333
import org.mockito.MockitoAnnotations;
3434

35-
import rx.observables.operations.OperationConcat;
36-
import rx.observables.operations.OperationFilter;
37-
import rx.observables.operations.OperationLast;
38-
import rx.observables.operations.OperationMap;
39-
import rx.observables.operations.OperationMaterialize;
40-
import rx.observables.operations.OperationMerge;
41-
import rx.observables.operations.OperationMergeDelayError;
42-
import rx.observables.operations.OperationOnErrorResumeNextViaFunction;
43-
import rx.observables.operations.OperationOnErrorResumeNextViaObservable;
44-
import rx.observables.operations.OperationOnErrorReturn;
45-
import rx.observables.operations.OperationScan;
46-
import rx.observables.operations.OperationSkip;
47-
import rx.observables.operations.OperationSynchronize;
48-
import rx.observables.operations.OperationTake;
49-
import rx.observables.operations.OperationToObservableFuture;
50-
import rx.observables.operations.OperationToObservableIterable;
51-
import rx.observables.operations.OperationToObservableList;
52-
import rx.observables.operations.OperationToObservableSortedList;
53-
import rx.observables.operations.OperationZip;
35+
import rx.operators.OperationConcat;
36+
import rx.operators.OperationFilter;
37+
import rx.operators.OperationLast;
38+
import rx.operators.OperationMap;
39+
import rx.operators.OperationMaterialize;
40+
import rx.operators.OperationMerge;
41+
import rx.operators.OperationMergeDelayError;
42+
import rx.operators.OperationOnErrorResumeNextViaFunction;
43+
import rx.operators.OperationOnErrorResumeNextViaObservable;
44+
import rx.operators.OperationOnErrorReturn;
45+
import rx.operators.OperationScan;
46+
import rx.operators.OperationSkip;
47+
import rx.operators.OperationSynchronize;
48+
import rx.operators.OperationTake;
49+
import rx.operators.OperationToObservableFuture;
50+
import rx.operators.OperationToObservableIterable;
51+
import rx.operators.OperationToObservableList;
52+
import rx.operators.OperationToObservableSortedList;
53+
import rx.operators.OperationZip;
5454
import rx.util.AtomicObservableSubscription;
5555
import rx.util.AtomicObserver;
5656
import rx.util.functions.Action0;

rxjava-core/src/main/java/rx/observables/Observer.java renamed to rxjava-core/src/main/java/rx/Observer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables;
16+
package rx;
1717

1818
/**
1919
* Provides a mechanism for receiving push-based notifications.

rxjava-core/src/main/java/rx/observables/Subscription.java renamed to rxjava-core/src/main/java/rx/Subscription.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables;
16+
package rx;
1717

1818
public interface Subscription {
1919

rxjava-core/src/main/java/rx/observables/operations/OperationCombineLatest.java renamed to rxjava-core/src/main/java/rx/operators/OperationCombineLatest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables.operations;
16+
package rx.operators;
1717

1818
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;
@@ -29,9 +29,9 @@
2929
import org.junit.Test;
3030
import org.mockito.InOrder;
3131

32-
import rx.observables.Observable;
33-
import rx.observables.Observer;
34-
import rx.observables.Subscription;
32+
import rx.Observable;
33+
import rx.Observer;
34+
import rx.Subscription;
3535
import rx.util.functions.Func1;
3636
import rx.util.functions.Func2;
3737
import rx.util.functions.Func3;
@@ -798,7 +798,7 @@ public TestObservable() {
798798
super(new Func1<Observer<String>, Subscription>() {
799799

800800
@Override
801-
public Subscription call(rx.observables.Observer<String> t1) {
801+
public Subscription call(rx.Observer<String> t1) {
802802
return null;
803803
// do nothing ... we are overriding the subscribe method for testing
804804
}

rxjava-core/src/main/java/rx/observables/operations/OperationConcat.java renamed to rxjava-core/src/main/java/rx/operators/OperationConcat.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables.operations;
16+
package rx.operators;
1717

1818

1919
import static org.junit.Assert.*;
@@ -28,9 +28,9 @@
2828
import org.junit.Before;
2929
import org.junit.Test;
3030

31-
import rx.observables.Observable;
32-
import rx.observables.Observer;
33-
import rx.observables.Subscription;
31+
import rx.Observable;
32+
import rx.Observer;
33+
import rx.Subscription;
3434
import rx.util.AtomicObservableSubscription;
3535
import rx.util.functions.Action1;
3636
import rx.util.functions.Func1;

rxjava-core/src/main/java/rx/observables/operations/OperationFilter.java renamed to rxjava-core/src/main/java/rx/operators/OperationFilter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.observables.operations;
16+
package rx.operators;
1717

1818
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;
2020

2121
import org.junit.Test;
2222
import org.mockito.Mockito;
2323

24-
import rx.observables.Observable;
25-
import rx.observables.Observer;
26-
import rx.observables.Subscription;
24+
import rx.Observable;
25+
import rx.Observer;
26+
import rx.Subscription;
2727
import rx.util.AtomicObservableSubscription;
2828
import rx.util.functions.Func1;
2929

0 commit comments

Comments
 (0)