From 75303612b0041b0e0e819b209e554826def251fd Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Fri, 30 May 2014 12:03:13 -0700 Subject: [PATCH] rx.operators -> rx.internal.operators --- rxjava-core/src/main/java/rx/Observable.java | 2 +- .../operators/BlockingOperatorLatest.java | 2 +- .../operators/BlockingOperatorMostRecent.java | 2 +- .../{ => internal}/operators/BlockingOperatorNext.java | 2 +- .../operators/BlockingOperatorToFuture.java | 2 +- .../operators/BlockingOperatorToIterator.java | 2 +- .../operators/BufferUntilSubscriber.java | 2 +- .../rx/{ => internal}/operators/NotificationLite.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeAmb.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeCache.java | 2 +- .../operators/OnSubscribeCombineLatest.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeDefer.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeDelay.java | 2 +- .../operators/OnSubscribeDelaySubscription.java | 2 +- .../operators/OnSubscribeDelayWithSelector.java | 4 ++-- .../operators/OnSubscribeFromIterable.java | 2 +- .../{ => internal}/operators/OnSubscribeGroupJoin.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeJoin.java | 2 +- .../operators/OnSubscribeMulticastSelector.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeRange.java | 2 +- .../{ => internal}/operators/OnSubscribeRefCount.java | 2 +- .../{ => internal}/operators/OnSubscribeTimerOnce.java | 2 +- .../operators/OnSubscribeTimerPeriodically.java | 2 +- .../operators/OnSubscribeToObservableFuture.java | 2 +- .../rx/{ => internal}/operators/OnSubscribeUsing.java | 2 +- .../java/rx/{ => internal}/operators/OperatorAll.java | 2 +- .../java/rx/{ => internal}/operators/OperatorAny.java | 2 +- .../{ => internal}/operators/OperatorAsObservable.java | 2 +- .../operators/OperatorBufferWithSingleObservable.java | 2 +- .../operators/OperatorBufferWithSize.java | 2 +- .../OperatorBufferWithStartEndObservable.java | 2 +- .../operators/OperatorBufferWithTime.java | 2 +- .../java/rx/{ => internal}/operators/OperatorCast.java | 2 +- .../rx/{ => internal}/operators/OperatorConcat.java | 2 +- .../operators/OperatorDebounceWithSelector.java | 4 ++-- .../operators/OperatorDebounceWithTime.java | 2 +- .../operators/OperatorDefaultIfEmpty.java | 2 +- .../operators/OperatorDematerialize.java | 2 +- .../rx/{ => internal}/operators/OperatorDistinct.java | 2 +- .../operators/OperatorDistinctUntilChanged.java | 2 +- .../rx/{ => internal}/operators/OperatorDoOnEach.java | 2 +- .../rx/{ => internal}/operators/OperatorElementAt.java | 2 +- .../rx/{ => internal}/operators/OperatorFilter.java | 2 +- .../rx/{ => internal}/operators/OperatorFinally.java | 2 +- .../rx/{ => internal}/operators/OperatorGroupBy.java | 2 +- .../{ => internal}/operators/OperatorGroupByUntil.java | 2 +- .../java/rx/{ => internal}/operators/OperatorMap.java | 2 +- .../{ => internal}/operators/OperatorMaterialize.java | 2 +- .../rx/{ => internal}/operators/OperatorMerge.java | 2 +- .../operators/OperatorMergeDelayError.java | 2 +- .../{ => internal}/operators/OperatorMergeMapPair.java | 2 +- .../operators/OperatorMergeMapTransform.java | 2 +- .../operators/OperatorMergeMaxConcurrent.java | 2 +- .../rx/{ => internal}/operators/OperatorMulticast.java | 2 +- .../rx/{ => internal}/operators/OperatorObserveOn.java | 2 +- .../operators/OperatorOnErrorFlatMap.java | 2 +- .../OperatorOnErrorResumeNextViaFunction.java | 2 +- .../OperatorOnErrorResumeNextViaObservable.java | 2 +- .../operators/OperatorOnErrorReturn.java | 2 +- .../OperatorOnExceptionResumeNextViaObservable.java | 2 +- .../rx/{ => internal}/operators/OperatorParallel.java | 2 +- .../operators/OperatorParallelMerge.java | 2 +- .../rx/{ => internal}/operators/OperatorPivot.java | 2 +- .../rx/{ => internal}/operators/OperatorRepeat.java | 2 +- .../rx/{ => internal}/operators/OperatorReplay.java | 2 +- .../rx/{ => internal}/operators/OperatorRetry.java | 2 +- .../operators/OperatorRetryWithPredicate.java | 2 +- .../operators/OperatorSampleWithObservable.java | 2 +- .../operators/OperatorSampleWithTime.java | 2 +- .../java/rx/{ => internal}/operators/OperatorScan.java | 2 +- .../operators/OperatorSequenceEqual.java | 2 +- .../rx/{ => internal}/operators/OperatorSerialize.java | 2 +- .../rx/{ => internal}/operators/OperatorSingle.java | 2 +- .../java/rx/{ => internal}/operators/OperatorSkip.java | 2 +- .../rx/{ => internal}/operators/OperatorSkipLast.java | 2 +- .../operators/OperatorSkipLastTimed.java | 2 +- .../rx/{ => internal}/operators/OperatorSkipTimed.java | 2 +- .../rx/{ => internal}/operators/OperatorSkipUntil.java | 2 +- .../rx/{ => internal}/operators/OperatorSkipWhile.java | 2 +- .../{ => internal}/operators/OperatorSubscribeOn.java | 2 +- .../rx/{ => internal}/operators/OperatorSwitch.java | 2 +- .../java/rx/{ => internal}/operators/OperatorTake.java | 2 +- .../rx/{ => internal}/operators/OperatorTakeLast.java | 2 +- .../operators/OperatorTakeLastTimed.java | 2 +- .../rx/{ => internal}/operators/OperatorTakeTimed.java | 2 +- .../rx/{ => internal}/operators/OperatorTakeUntil.java | 2 +- .../rx/{ => internal}/operators/OperatorTakeWhile.java | 2 +- .../operators/OperatorThrottleFirst.java | 2 +- .../{ => internal}/operators/OperatorTimeInterval.java | 2 +- .../rx/{ => internal}/operators/OperatorTimeout.java | 2 +- .../{ => internal}/operators/OperatorTimeoutBase.java | 2 +- .../operators/OperatorTimeoutWithSelector.java | 2 +- .../rx/{ => internal}/operators/OperatorTimestamp.java | 2 +- .../rx/{ => internal}/operators/OperatorToMap.java | 2 +- .../{ => internal}/operators/OperatorToMultimap.java | 2 +- .../operators/OperatorToObservableList.java | 2 +- .../operators/OperatorToObservableSortedList.java | 2 +- .../operators/OperatorUnsubscribeOn.java | 2 +- .../operators/OperatorWindowWithObservable.java | 2 +- .../operators/OperatorWindowWithSize.java | 2 +- .../OperatorWindowWithStartEndObservable.java | 2 +- .../operators/OperatorWindowWithTime.java | 2 +- .../java/rx/{ => internal}/operators/OperatorZip.java | 2 +- .../{ => internal}/operators/OperatorZipIterable.java | 2 +- .../README.txt => internal/operators/README.md} | 2 +- .../main/java/rx/{ => internal}/operators/package.html | 0 .../main/java/rx/observables/BlockingObservable.java | 10 +++++----- .../java/rx/observables/ConnectableObservable.java | 2 +- .../src/main/java/rx/subjects/AsyncSubject.java | 2 +- .../src/main/java/rx/subjects/BehaviorSubject.java | 2 +- .../src/main/java/rx/subjects/PublishSubject.java | 2 +- .../src/main/java/rx/subjects/ReplaySubject.java | 2 +- .../java/rx/subjects/SubjectSubscriptionManager.java | 4 ++-- rxjava-core/src/main/java/rx/subjects/TestSubject.java | 2 +- .../src/perf/java/rx/operators/OperatorMapPerf.java | 1 + .../operators/BlockingOperatorLatestTest.java | 2 +- .../operators/BlockingOperatorMostRecentTest.java | 4 ++-- .../operators/BlockingOperatorNextTest.java | 5 +++-- .../operators/BlockingOperatorToFutureTest.java | 4 ++-- .../operators/BlockingOperatorToIteratorTest.java | 4 ++-- .../{ => internal}/operators/OnSubscribeAmbTest.java | 4 ++-- .../{ => internal}/operators/OnSubscribeCacheTest.java | 3 ++- .../operators/OnSubscribeCombineLatestTest.java | 2 +- .../{ => internal}/operators/OnSubscribeDeferTest.java | 2 +- .../{ => internal}/operators/OnSubscribeDelayTest.java | 2 +- .../operators/OnSubscribeFromIterableTest.java | 3 ++- .../operators/OnSubscribeGroupJoinTest.java | 2 +- .../{ => internal}/operators/OnSubscribeJoinTest.java | 2 +- .../operators/OnSubscribeMulticastTest.java | 2 +- .../{ => internal}/operators/OnSubscribeRangeTest.java | 2 +- .../{ => internal}/operators/OnSubscribeTimerTest.java | 2 +- .../operators/OnSubscribeToObservableFutureTest.java | 2 +- .../{ => internal}/operators/OnSubscribeUsingTest.java | 2 +- .../rx/{ => internal}/operators/OperatorAllTest.java | 2 +- .../rx/{ => internal}/operators/OperatorAnyTest.java | 2 +- .../operators/OperatorAsObservableTest.java | 2 +- .../{ => internal}/operators/OperatorBufferTest.java | 2 +- .../rx/{ => internal}/operators/OperatorCastTest.java | 2 +- .../{ => internal}/operators/OperatorConcatTest.java | 2 +- .../{ => internal}/operators/OperatorDebounceTest.java | 2 +- .../operators/OperatorDefaultIfEmptyTest.java | 2 +- .../operators/OperatorDematerializeTest.java | 2 +- .../{ => internal}/operators/OperatorDistinctTest.java | 2 +- .../operators/OperatorDistinctUntilChangedTest.java | 2 +- .../{ => internal}/operators/OperatorDoOnEachTest.java | 2 +- .../operators/OperatorElementAtTest.java | 2 +- .../{ => internal}/operators/OperatorFilterTest.java | 2 +- .../{ => internal}/operators/OperatorFinallyTest.java | 2 +- .../rx/{ => internal}/operators/OperatorFirstTest.java | 2 +- .../{ => internal}/operators/OperatorGroupByTest.java | 3 ++- .../operators/OperatorGroupByUntilTest.java | 2 +- .../rx/{ => internal}/operators/OperatorLastTest.java | 2 +- .../rx/{ => internal}/operators/OperatorMapTest.java | 3 ++- .../operators/OperatorMaterializeTest.java | 2 +- .../operators/OperatorMergeDelayErrorTest.java | 2 +- .../{ => internal}/operators/OperatorMergeMapTest.java | 2 +- .../operators/OperatorMergeMaxConcurrentTest.java | 2 +- .../rx/{ => internal}/operators/OperatorMergeTest.java | 2 +- .../operators/OperatorObserveOnTest.java | 2 +- .../operators/OperatorOnErrorFlatMapTest.java | 2 +- .../OperatorOnErrorResumeNextViaFunctionTest.java | 2 +- .../OperatorOnErrorResumeNextViaObservableTest.java | 2 +- .../operators/OperatorOnErrorReturnTest.java | 2 +- ...OperatorOnExceptionResumeNextViaObservableTest.java | 2 +- .../operators/OperatorParallelMergeTest.java | 2 +- .../{ => internal}/operators/OperatorParallelTest.java | 2 +- .../rx/{ => internal}/operators/OperatorPivotTest.java | 2 +- .../{ => internal}/operators/OperatorReduceTest.java | 2 +- .../{ => internal}/operators/OperatorRepeatTest.java | 2 +- .../{ => internal}/operators/OperatorReplayTest.java | 2 +- .../rx/{ => internal}/operators/OperatorRetryTest.java | 3 ++- .../operators/OperatorRetryWithPredicateTest.java | 2 +- .../{ => internal}/operators/OperatorSampleTest.java | 2 +- .../rx/{ => internal}/operators/OperatorScanTest.java | 2 +- .../operators/OperatorSequenceEqualTest.java | 2 +- .../operators/OperatorSerializeTest.java | 2 +- .../{ => internal}/operators/OperatorSingleTest.java | 2 +- .../{ => internal}/operators/OperatorSkipLastTest.java | 2 +- .../operators/OperatorSkipLastTimedTest.java | 2 +- .../rx/{ => internal}/operators/OperatorSkipTest.java | 3 ++- .../operators/OperatorSkipTimedTest.java | 2 +- .../operators/OperatorSkipUntilTest.java | 2 +- .../operators/OperatorSkipWhileTest.java | 2 +- .../operators/OperatorSubscribeOnTest.java | 2 +- .../{ => internal}/operators/OperatorSwitchTest.java | 2 +- .../{ => internal}/operators/OperatorTakeLastTest.java | 2 +- .../operators/OperatorTakeLastTimedTest.java | 2 +- .../rx/{ => internal}/operators/OperatorTakeTest.java | 3 ++- .../operators/OperatorTakeTimedTest.java | 2 +- .../operators/OperatorTakeUntilTest.java | 4 ++-- .../operators/OperatorTakeWhileTest.java | 2 +- .../operators/OperatorThrottleFirstTest.java | 2 +- .../operators/OperatorTimeIntervalTest.java | 2 +- .../{ => internal}/operators/OperatorTimeoutTests.java | 2 +- .../operators/OperatorTimeoutWithSelectorTest.java | 2 +- .../operators/OperatorTimestampTest.java | 2 +- .../rx/{ => internal}/operators/OperatorToMapTest.java | 2 +- .../operators/OperatorToMultimapTest.java | 6 +++--- .../operators/OperatorToObservableListTest.java | 3 ++- .../operators/OperatorToObservableSortedListTest.java | 3 ++- .../operators/OperatorUnsubscribeOnTest.java | 2 +- .../{ => internal}/operators/OperatorWindowTest.java | 2 +- .../operators/OperatorZipCompletionTest.java | 2 +- .../operators/OperatorZipIterableTest.java | 2 +- .../rx/{ => internal}/operators/OperatorZipTest.java | 2 +- .../{ => internal}/operators/SafeSubscriberTest.java | 2 +- 206 files changed, 230 insertions(+), 219 deletions(-) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BlockingOperatorLatest.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BlockingOperatorMostRecent.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BlockingOperatorNext.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BlockingOperatorToFuture.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BlockingOperatorToIterator.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/BufferUntilSubscriber.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/NotificationLite.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeAmb.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeCache.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeCombineLatest.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeDefer.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeDelay.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeDelaySubscription.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeDelayWithSelector.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeFromIterable.java (97%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeGroupJoin.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeJoin.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeMulticastSelector.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeRange.java (97%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeRefCount.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeTimerOnce.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeTimerPeriodically.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeToObservableFuture.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OnSubscribeUsing.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorAll.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorAny.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorAsObservable.java (96%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorBufferWithSingleObservable.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorBufferWithSize.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorBufferWithStartEndObservable.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorBufferWithTime.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorCast.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorConcat.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDebounceWithSelector.java (96%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDebounceWithTime.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDefaultIfEmpty.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDematerialize.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDistinct.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDistinctUntilChanged.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorDoOnEach.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorElementAt.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorFilter.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorFinally.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorGroupBy.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorGroupByUntil.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMap.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMaterialize.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMerge.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMergeDelayError.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMergeMapPair.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMergeMapTransform.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMergeMaxConcurrent.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorMulticast.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorObserveOn.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorOnErrorFlatMap.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorOnErrorResumeNextViaFunction.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorOnErrorResumeNextViaObservable.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorOnErrorReturn.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorOnExceptionResumeNextViaObservable.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorParallel.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorParallelMerge.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorPivot.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorRepeat.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorReplay.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorRetry.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorRetryWithPredicate.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSampleWithObservable.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSampleWithTime.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorScan.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSequenceEqual.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSerialize.java (97%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSingle.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkip.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkipLast.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkipLastTimed.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkipTimed.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkipUntil.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSkipWhile.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSubscribeOn.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorSwitch.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTake.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTakeLast.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTakeLastTimed.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTakeTimed.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTakeUntil.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTakeWhile.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorThrottleFirst.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTimeInterval.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTimeout.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTimeoutBase.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTimeoutWithSelector.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorTimestamp.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorToMap.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorToMultimap.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorToObservableList.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorToObservableSortedList.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorUnsubscribeOn.java (98%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorWindowWithObservable.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorWindowWithSize.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorWindowWithStartEndObservable.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorWindowWithTime.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorZip.java (99%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/OperatorZipIterable.java (98%) rename rxjava-core/src/main/java/rx/{operators/README.txt => internal/operators/README.md} (89%) rename rxjava-core/src/main/java/rx/{ => internal}/operators/package.html (100%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/BlockingOperatorLatestTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/BlockingOperatorMostRecentTest.java (96%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/BlockingOperatorNextTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/BlockingOperatorToFutureTest.java (97%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/BlockingOperatorToIteratorTest.java (94%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeAmbTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeCacheTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeCombineLatestTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeDeferTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeDelayTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeFromIterableTest.java (96%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeGroupJoinTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeJoinTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeMulticastTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeRangeTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeTimerTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeToObservableFutureTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OnSubscribeUsingTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorAllTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorAnyTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorAsObservableTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorBufferTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorCastTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorConcatTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDebounceTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDefaultIfEmptyTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDematerializeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDistinctTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDistinctUntilChangedTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorDoOnEachTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorElementAtTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorFilterTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorFinallyTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorFirstTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorGroupByTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorGroupByUntilTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorLastTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMapTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMaterializeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMergeDelayErrorTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMergeMapTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMergeMaxConcurrentTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorMergeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorObserveOnTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorOnErrorFlatMapTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorOnErrorResumeNextViaFunctionTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorOnErrorResumeNextViaObservableTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorOnErrorReturnTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorOnExceptionResumeNextViaObservableTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorParallelMergeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorParallelTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorPivotTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorReduceTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorRepeatTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorReplayTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorRetryTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorRetryWithPredicateTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSampleTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorScanTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSequenceEqualTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSerializeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSingleTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipLastTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipLastTimedTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipTimedTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipUntilTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSkipWhileTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSubscribeOnTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorSwitchTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeLastTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeLastTimedTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeTimedTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeUntilTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTakeWhileTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorThrottleFirstTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTimeIntervalTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTimeoutTests.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTimeoutWithSelectorTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorTimestampTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorToMapTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorToMultimapTest.java (98%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorToObservableListTest.java (97%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorToObservableSortedListTest.java (96%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorUnsubscribeOnTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorWindowTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorZipCompletionTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorZipIterableTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/OperatorZipTest.java (99%) rename rxjava-core/src/test/java/rx/{ => internal}/operators/SafeSubscriberTest.java (99%) diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java index 9af2e9dc97..cc07c93e59 100644 --- a/rxjava-core/src/main/java/rx/Observable.java +++ b/rxjava-core/src/main/java/rx/Observable.java @@ -19,9 +19,9 @@ import rx.exceptions.*; import rx.functions.*; +import rx.internal.operators.*; import rx.observables.*; import rx.observers.SafeSubscriber; -import rx.operators.*; import rx.plugins.*; import rx.schedulers.*; import rx.subjects.*; diff --git a/rxjava-core/src/main/java/rx/operators/BlockingOperatorLatest.java b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorLatest.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BlockingOperatorLatest.java rename to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorLatest.java index 682b36d168..9d33d1abe2 100644 --- a/rxjava-core/src/main/java/rx/operators/BlockingOperatorLatest.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorLatest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/rxjava-core/src/main/java/rx/operators/BlockingOperatorMostRecent.java b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BlockingOperatorMostRecent.java rename to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java index 81f846f392..323e41a8eb 100644 --- a/rxjava-core/src/main/java/rx/operators/BlockingOperatorMostRecent.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/BlockingOperatorNext.java b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorNext.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BlockingOperatorNext.java rename to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorNext.java index fdb688156a..7f44d8389d 100644 --- a/rxjava-core/src/main/java/rx/operators/BlockingOperatorNext.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorNext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/rxjava-core/src/main/java/rx/operators/BlockingOperatorToFuture.java b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToFuture.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BlockingOperatorToFuture.java rename to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToFuture.java index 4a9bbbba55..d6ce7a1b1b 100644 --- a/rxjava-core/src/main/java/rx/operators/BlockingOperatorToFuture.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.CancellationException; import java.util.concurrent.CountDownLatch; diff --git a/rxjava-core/src/main/java/rx/operators/BlockingOperatorToIterator.java b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BlockingOperatorToIterator.java rename to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java index d5922b2cdd..3541e67302 100644 --- a/rxjava-core/src/main/java/rx/operators/BlockingOperatorToIterator.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/rxjava-core/src/main/java/rx/operators/BufferUntilSubscriber.java b/rxjava-core/src/main/java/rx/internal/operators/BufferUntilSubscriber.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/BufferUntilSubscriber.java rename to rxjava-core/src/main/java/rx/internal/operators/BufferUntilSubscriber.java index a2046aa56b..8f44c35ca5 100644 --- a/rxjava-core/src/main/java/rx/operators/BufferUntilSubscriber.java +++ b/rxjava-core/src/main/java/rx/internal/operators/BufferUntilSubscriber.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/NotificationLite.java b/rxjava-core/src/main/java/rx/internal/operators/NotificationLite.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/NotificationLite.java rename to rxjava-core/src/main/java/rx/internal/operators/NotificationLite.java index 025ba98df9..4da0b3851b 100644 --- a/rxjava-core/src/main/java/rx/operators/NotificationLite.java +++ b/rxjava-core/src/main/java/rx/internal/operators/NotificationLite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.io.Serializable; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeAmb.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeAmb.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeAmb.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeAmb.java index c0cc1d51bb..6257a7804b 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeAmb.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeAmb.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.List; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeCache.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCache.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeCache.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCache.java index 889843efcf..d9ffa1936e 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeCache.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeCombineLatest.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCombineLatest.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeCombineLatest.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCombineLatest.java index 7feee1ee63..d03566bbf8 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeCombineLatest.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCombineLatest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.BitSet; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeDefer.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDefer.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeDefer.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDefer.java index dc33362bc0..96cb996053 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeDefer.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDefer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.OnSubscribe; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelay.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelay.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeDelay.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelay.java index 59fea8c7fc..e84d37c767 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelay.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelaySubscription.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelaySubscription.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeDelaySubscription.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelaySubscription.java index e8bc601c8b..d60bdb73a6 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelaySubscription.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelaySubscription.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelayWithSelector.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelayWithSelector.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeDelayWithSelector.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelayWithSelector.java index f47e0ce80f..c975c4e902 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeDelayWithSelector.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeDelayWithSelector.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.functions.Func0; import rx.functions.Func1; +import rx.internal.operators.OnSubscribeDelay.Emitter; import rx.observers.SerializedSubscriber; -import rx.operators.OnSubscribeDelay.Emitter; import rx.subscriptions.CompositeSubscription; /** diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeFromIterable.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeFromIterable.java similarity index 97% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeFromIterable.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeFromIterable.java index 38766395f4..fa79ca3324 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeFromIterable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeFromIterable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.OnSubscribe; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeGroupJoin.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeGroupJoin.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java index 8fae460dc2..e80b560dcd 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeGroupJoin.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeGroupJoin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.HashMap; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeJoin.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeJoin.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeJoin.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeJoin.java index d6d7c2afd3..b6edd5c366 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeJoin.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeJoin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.HashMap; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeMulticastSelector.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeMulticastSelector.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeMulticastSelector.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeMulticastSelector.java index 2e3db1c279..270ad5114a 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeMulticastSelector.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeMulticastSelector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.OnSubscribe; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeRange.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRange.java similarity index 97% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeRange.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRange.java index 797bb49718..b96d15d8d5 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeRange.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.OnSubscribe; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeRefCount.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRefCount.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeRefCount.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRefCount.java index 1798c0e3f0..35655bdf82 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeRefCount.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeRefCount.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.List; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeTimerOnce.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerOnce.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeTimerOnce.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerOnce.java index e6aa7a362d..cf31ae6ca8 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeTimerOnce.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerOnce.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import rx.Observable.OnSubscribe; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeTimerPeriodically.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerPeriodically.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeTimerPeriodically.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerPeriodically.java index 1c6b718f78..33811b69e5 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeTimerPeriodically.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeTimerPeriodically.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import rx.Observable.OnSubscribe; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeToObservableFuture.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeToObservableFuture.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeToObservableFuture.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeToObservableFuture.java index d04b8fd013..3a5bd95e3f 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeToObservableFuture.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeToObservableFuture.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/main/java/rx/operators/OnSubscribeUsing.java b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeUsing.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OnSubscribeUsing.java rename to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeUsing.java index 425e822f26..95e1d5a844 100644 --- a/rxjava-core/src/main/java/rx/operators/OnSubscribeUsing.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OnSubscribeUsing.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.OnSubscribe; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorAll.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorAll.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorAll.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorAll.java index 6539296fe7..6ac757a1fe 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorAll.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorAll.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorAny.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorAny.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorAny.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorAny.java index ff46549a2f..05d04c5998 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorAny.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorAny.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorAsObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorAsObservable.java similarity index 96% rename from rxjava-core/src/main/java/rx/operators/OperatorAsObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorAsObservable.java index 3c25e4b4f9..d8cbc7b756 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorAsObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorAsObservable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithSingleObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSingleObservable.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorBufferWithSingleObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSingleObservable.java index be9e9f2f72..204fc365f1 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithSingleObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSingleObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.List; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithSize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSize.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorBufferWithSize.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSize.java index 7334d958f7..b0add8b72d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithSize.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithSize.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithStartEndObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithStartEndObservable.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorBufferWithStartEndObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithStartEndObservable.java index 22931fb38a..8e8cb4eeef 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithStartEndObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithStartEndObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithTime.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithTime.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorBufferWithTime.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithTime.java index bed97c3c7c..8111420e20 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorBufferWithTime.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorBufferWithTime.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorCast.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorCast.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorCast.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorCast.java index 59afea80da..92dd1792e5 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorCast.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorCast.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorConcat.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorConcat.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorConcat.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorConcat.java index 26ffbe04f5..02285d3cfe 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorConcat.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorConcat.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDebounceWithSelector.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithSelector.java similarity index 96% rename from rxjava-core/src/main/java/rx/operators/OperatorDebounceWithSelector.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithSelector.java index cfdf5af7f1..fc0f2b69fc 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDebounceWithSelector.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithSelector.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; import rx.Subscriber; import rx.functions.Func1; +import rx.internal.operators.OperatorDebounceWithTime.DebounceState; import rx.observers.SerializedSubscriber; -import rx.operators.OperatorDebounceWithTime.DebounceState; import rx.subscriptions.SerialSubscription; /** diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDebounceWithTime.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithTime.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorDebounceWithTime.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithTime.java index a66d1a7a3e..b97bc90d3e 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDebounceWithTime.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDebounceWithTime.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDefaultIfEmpty.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDefaultIfEmpty.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorDefaultIfEmpty.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDefaultIfEmpty.java index 4bb5fd1d0b..1265f81907 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDefaultIfEmpty.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDefaultIfEmpty.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDematerialize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDematerialize.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorDematerialize.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDematerialize.java index 043837ac42..5365277275 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDematerialize.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDematerialize.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Notification; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDistinct.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDistinct.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorDistinct.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDistinct.java index 02efa1b9fd..f05cc0ba24 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDistinct.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDistinct.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.HashSet; import java.util.Set; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDistinctUntilChanged.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDistinctUntilChanged.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorDistinctUntilChanged.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDistinctUntilChanged.java index 90b1c44141..bf8e9e01ed 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDistinctUntilChanged.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDistinctUntilChanged.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorDoOnEach.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorDoOnEach.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorDoOnEach.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorDoOnEach.java index 150ad112b3..baf19d0665 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorDoOnEach.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorDoOnEach.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Observer; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorElementAt.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorElementAt.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorElementAt.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorElementAt.java index 6c92c49009..92832d7845 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorElementAt.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorElementAt.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorFilter.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorFilter.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorFilter.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorFilter.java index 76b256c720..6be1d17872 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorFilter.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorFinally.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorFinally.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorFinally.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorFinally.java index 4dc4ef3818..f164b37f32 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorFinally.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorFinally.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorGroupBy.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorGroupBy.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorGroupBy.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorGroupBy.java index 5a58d89802..43c270ceea 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorGroupBy.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorGroupBy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.HashMap; import java.util.Map; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorGroupByUntil.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorGroupByUntil.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorGroupByUntil.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorGroupByUntil.java index d40ca81d93..16eff6ad07 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorGroupByUntil.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorGroupByUntil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMap.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMap.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorMap.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMap.java index 233e2fcb70..3043c8d7ba 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMap.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMaterialize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMaterialize.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorMaterialize.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMaterialize.java index 1162ca9808..98f5c4ae6a 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMaterialize.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMaterialize.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Notification; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMerge.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMerge.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorMerge.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMerge.java index 20f2a31071..706ef6ff89 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMerge.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMerge.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMergeDelayError.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeDelayError.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorMergeDelayError.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMergeDelayError.java index a62aaa9db2..3985e4b083 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMergeDelayError.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeDelayError.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMergeMapPair.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapPair.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorMergeMapPair.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapPair.java index 7db1c21daf..b185a8fd4e 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMergeMapPair.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapPair.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMergeMapTransform.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapTransform.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorMergeMapTransform.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapTransform.java index f4c5a6c761..d1a2394ebe 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMergeMapTransform.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMapTransform.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMergeMaxConcurrent.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMaxConcurrent.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorMergeMaxConcurrent.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMaxConcurrent.java index bdb99e8cc5..0bc374cafb 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMergeMaxConcurrent.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeMaxConcurrent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.LinkedList; import java.util.Queue; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorMulticast.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMulticast.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorMulticast.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorMulticast.java index db57ccebd4..6b5cbcdcc0 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorMulticast.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorMulticast.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorObserveOn.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorObserveOn.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorObserveOn.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorObserveOn.java index 0c8daab08e..f7e348269a 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorObserveOn.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorObserveOn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorFlatMap.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorFlatMap.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorOnErrorFlatMap.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorFlatMap.java index 9546348f2f..e7750785c3 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorFlatMap.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorFlatMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaFunction.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaFunction.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java index 9fc5a675b2..c1a5c8bb73 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaFunction.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java index 7be9fe1f82..efee5c8c1b 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorReturn.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorReturn.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorOnErrorReturn.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorReturn.java index c86c36032c..f96441a76f 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorOnErrorReturn.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorReturn.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Arrays; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorOnExceptionResumeNextViaObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorOnExceptionResumeNextViaObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java index 93b775094e..db3a344cce 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorOnExceptionResumeNextViaObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorParallel.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorParallel.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorParallel.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorParallel.java index dcc92bf462..98b93a6a02 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorParallel.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorParallel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorParallelMerge.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorParallelMerge.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorParallelMerge.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorParallelMerge.java index 5d74a41982..77790da295 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorParallelMerge.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorParallelMerge.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicLongFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorPivot.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorPivot.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorPivot.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorPivot.java index 9447848be5..cefb7d7430 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorPivot.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorPivot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Collections; import java.util.HashSet; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorRepeat.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorRepeat.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorRepeat.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorRepeat.java index 9ca9f75b9e..b9f78252af 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorRepeat.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorRepeat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorReplay.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorReplay.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorReplay.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorReplay.java index 0452ca3712..f83c66d4b0 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorReplay.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorReplay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorRetry.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorRetry.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorRetry.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorRetry.java index 1c2d431ecb..4556652aa9 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorRetry.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorRetry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; /** * Copyright 2014 Netflix, Inc. diff --git a/rxjava-core/src/main/java/rx/operators/OperatorRetryWithPredicate.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorRetryWithPredicate.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorRetryWithPredicate.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorRetryWithPredicate.java index 87a1560295..92eb34ca0f 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorRetryWithPredicate.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorRetryWithPredicate.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSampleWithObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithObservable.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSampleWithObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithObservable.java index 9795171218..a89b419025 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSampleWithObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicReference; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSampleWithTime.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithTime.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorSampleWithTime.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithTime.java index 7474c9ec04..288595b1e9 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSampleWithTime.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSampleWithTime.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorScan.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorScan.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorScan.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorScan.java index d1e9b769a9..767ae50982 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorScan.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorScan.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSequenceEqual.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSequenceEqual.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java index 600a8843f6..f96f718af8 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSequenceEqual.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static rx.Observable.concat; import static rx.Observable.from; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSerialize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSerialize.java similarity index 97% rename from rxjava-core/src/main/java/rx/operators/OperatorSerialize.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSerialize.java index f41620bab2..0790c4864c 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSerialize.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSerialize.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSingle.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSingle.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSingle.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSingle.java index f633354817..c9e87e9f0d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSingle.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSingle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.NoSuchElementException; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkip.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkip.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkip.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkip.java index 29602d49f2..77adbef9cc 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkip.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkip.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkipLast.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLast.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkipLast.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLast.java index d8d297cd75..ca3ef3551d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkipLast.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLast.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayDeque; import java.util.Deque; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkipLastTimed.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLastTimed.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkipLastTimed.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLastTimed.java index cd4e107923..7ea9c774b0 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkipLastTimed.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipLastTimed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayDeque; import java.util.Deque; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkipTimed.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipTimed.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkipTimed.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkipTimed.java index 5119c85aaf..77e1fe1322 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkipTimed.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipTimed.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkipUntil.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipUntil.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkipUntil.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkipUntil.java index b061c39f9f..2208c7baec 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkipUntil.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipUntil.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.atomic.AtomicBoolean; import rx.Observable; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSkipWhile.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipWhile.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSkipWhile.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSkipWhile.java index f60e28f32e..5f3b8a26f0 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSkipWhile.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSkipWhile.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSubscribeOn.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSubscribeOn.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorSubscribeOn.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSubscribeOn.java index a59671e6a2..c289115b86 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSubscribeOn.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSubscribeOn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorSwitch.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSwitch.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorSwitch.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorSwitch.java index d3719e2d08..83a4639463 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorSwitch.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorSwitch.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.List; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTake.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTake.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTake.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTake.java index 414001fc10..94757fc384 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTake.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTake.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTakeLast.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLast.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTakeLast.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLast.java index c3d6f9c3b3..d50c31d762 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTakeLast.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLast.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTakeLastTimed.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLastTimed.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorTakeLastTimed.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLastTimed.java index 80e83bae57..352f44562d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTakeLastTimed.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeLastTimed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Scheduler; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTakeTimed.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeTimed.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTakeTimed.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTakeTimed.java index 77a17c1fdb..ea56be87ac 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTakeTimed.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeTimed.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; import rx.Observable.Operator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTakeUntil.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeUntil.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorTakeUntil.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTakeUntil.java index 2821302170..78ef0e7204 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTakeUntil.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeUntil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTakeWhile.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeWhile.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTakeWhile.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTakeWhile.java index 2ec1f27884..4c685b3a85 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTakeWhile.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTakeWhile.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorThrottleFirst.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorThrottleFirst.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorThrottleFirst.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorThrottleFirst.java index e693eed821..6441b18d70 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorThrottleFirst.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorThrottleFirst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTimeInterval.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeInterval.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTimeInterval.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTimeInterval.java index 6c88777f80..4b76ea768d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTimeInterval.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeInterval.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Scheduler; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTimeout.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeout.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTimeout.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTimeout.java index cbb587e38d..f1278c933c 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTimeout.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeout.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTimeoutBase.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutBase.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorTimeoutBase.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutBase.java index 808e650835..1d56d28afd 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTimeoutBase.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTimeoutWithSelector.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutWithSelector.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorTimeoutWithSelector.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutWithSelector.java index 08be2be005..6295a35fbf 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTimeoutWithSelector.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimeoutWithSelector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable; import rx.Scheduler; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorTimestamp.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimestamp.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorTimestamp.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorTimestamp.java index a6d2a360da..4fccc08d53 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorTimestamp.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorTimestamp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Scheduler; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorToMap.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorToMap.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorToMap.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorToMap.java index f446fbe4e8..b33e8bd1a6 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorToMap.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorToMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.HashMap; import java.util.Map; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorToMultimap.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorToMultimap.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorToMultimap.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorToMultimap.java index f0643dcd93..41804d7384 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorToMultimap.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorToMultimap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Collection; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorToObservableList.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableList.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorToObservableList.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableList.java index edab32e40d..b27a670e66 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorToObservableList.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorToObservableSortedList.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableSortedList.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorToObservableSortedList.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableSortedList.java index fa1c931ca5..510ebe7aec 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorToObservableSortedList.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorToObservableSortedList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Collections; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorUnsubscribeOn.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorUnsubscribeOn.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorUnsubscribeOn.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorUnsubscribeOn.java index 096eaef928..b33e62b493 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorUnsubscribeOn.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorUnsubscribeOn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import rx.Observable.Operator; import rx.Scheduler; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithObservable.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorWindowWithObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithObservable.java index bcf5e2b538..9ef91ecc0e 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Collections; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithSize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithSize.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorWindowWithSize.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithSize.java index 2f68e9c10f..d6dfff6393 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithSize.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithSize.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithStartEndObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithStartEndObservable.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorWindowWithStartEndObservable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithStartEndObservable.java index 24fb55d805..86c820ab7a 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithStartEndObservable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithStartEndObservable.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithTime.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithTime.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorWindowWithTime.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithTime.java index 528aa65373..a9122e4558 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorWindowWithTime.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorWindowWithTime.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.util.ArrayList; import java.util.Collections; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorZip.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorZip.java similarity index 99% rename from rxjava-core/src/main/java/rx/operators/OperatorZip.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorZip.java index ec6034553d..f759a8c67d 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorZip.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorZip.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicLongFieldUpdater; diff --git a/rxjava-core/src/main/java/rx/operators/OperatorZipIterable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorZipIterable.java similarity index 98% rename from rxjava-core/src/main/java/rx/operators/OperatorZipIterable.java rename to rxjava-core/src/main/java/rx/internal/operators/OperatorZipIterable.java index b5a8862a51..e73e093082 100644 --- a/rxjava-core/src/main/java/rx/operators/OperatorZipIterable.java +++ b/rxjava-core/src/main/java/rx/internal/operators/OperatorZipIterable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; diff --git a/rxjava-core/src/main/java/rx/operators/README.txt b/rxjava-core/src/main/java/rx/internal/operators/README.md similarity index 89% rename from rxjava-core/src/main/java/rx/operators/README.txt rename to rxjava-core/src/main/java/rx/internal/operators/README.md index a3a2a3e394..034883b188 100644 --- a/rxjava-core/src/main/java/rx/operators/README.txt +++ b/rxjava-core/src/main/java/rx/internal/operators/README.md @@ -14,7 +14,7 @@ limitations under the License. ==== -This package "rx.operators" is for internal implementation details and can change at any time. +This package "rx.internal.operators" is for internal implementation details and can change at any time. It is excluded from the public Javadocs (http://netflix.github.io/RxJava/javadoc/) and should not be relied upon by any code. diff --git a/rxjava-core/src/main/java/rx/operators/package.html b/rxjava-core/src/main/java/rx/internal/operators/package.html similarity index 100% rename from rxjava-core/src/main/java/rx/operators/package.html rename to rxjava-core/src/main/java/rx/internal/operators/package.html diff --git a/rxjava-core/src/main/java/rx/observables/BlockingObservable.java b/rxjava-core/src/main/java/rx/observables/BlockingObservable.java index c1ba314304..d0817601a8 100644 --- a/rxjava-core/src/main/java/rx/observables/BlockingObservable.java +++ b/rxjava-core/src/main/java/rx/observables/BlockingObservable.java @@ -26,11 +26,11 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.functions.Functions; -import rx.operators.BlockingOperatorLatest; -import rx.operators.BlockingOperatorMostRecent; -import rx.operators.BlockingOperatorNext; -import rx.operators.BlockingOperatorToFuture; -import rx.operators.BlockingOperatorToIterator; +import rx.internal.operators.BlockingOperatorLatest; +import rx.internal.operators.BlockingOperatorMostRecent; +import rx.internal.operators.BlockingOperatorNext; +import rx.internal.operators.BlockingOperatorToFuture; +import rx.internal.operators.BlockingOperatorToIterator; /** * An extension of {@link Observable} that provides blocking operators. diff --git a/rxjava-core/src/main/java/rx/observables/ConnectableObservable.java b/rxjava-core/src/main/java/rx/observables/ConnectableObservable.java index 8f0c689688..a5f9b1a85d 100644 --- a/rxjava-core/src/main/java/rx/observables/ConnectableObservable.java +++ b/rxjava-core/src/main/java/rx/observables/ConnectableObservable.java @@ -19,7 +19,7 @@ import rx.Subscriber; import rx.Subscription; import rx.functions.Action1; -import rx.operators.OnSubscribeRefCount; +import rx.internal.operators.OnSubscribeRefCount; /** * A {@code ConnectableObservable} resembles an ordinary {@link Observable}, except that it does not begin diff --git a/rxjava-core/src/main/java/rx/subjects/AsyncSubject.java b/rxjava-core/src/main/java/rx/subjects/AsyncSubject.java index e146423d00..233ba941a4 100644 --- a/rxjava-core/src/main/java/rx/subjects/AsyncSubject.java +++ b/rxjava-core/src/main/java/rx/subjects/AsyncSubject.java @@ -17,7 +17,7 @@ import rx.Observer; import rx.functions.Action1; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.subjects.SubjectSubscriptionManager.SubjectObserver; /** diff --git a/rxjava-core/src/main/java/rx/subjects/BehaviorSubject.java b/rxjava-core/src/main/java/rx/subjects/BehaviorSubject.java index 70d9430358..128cd9830c 100644 --- a/rxjava-core/src/main/java/rx/subjects/BehaviorSubject.java +++ b/rxjava-core/src/main/java/rx/subjects/BehaviorSubject.java @@ -18,7 +18,7 @@ import rx.Observer; import rx.functions.Action1; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.subjects.SubjectSubscriptionManager.SubjectObserver; /** diff --git a/rxjava-core/src/main/java/rx/subjects/PublishSubject.java b/rxjava-core/src/main/java/rx/subjects/PublishSubject.java index 93763e7eed..c5da813d15 100644 --- a/rxjava-core/src/main/java/rx/subjects/PublishSubject.java +++ b/rxjava-core/src/main/java/rx/subjects/PublishSubject.java @@ -17,7 +17,7 @@ import rx.Observer; import rx.functions.Action1; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.subjects.SubjectSubscriptionManager.SubjectObserver; /** diff --git a/rxjava-core/src/main/java/rx/subjects/ReplaySubject.java b/rxjava-core/src/main/java/rx/subjects/ReplaySubject.java index c1647f9bef..45f0a6ce70 100644 --- a/rxjava-core/src/main/java/rx/subjects/ReplaySubject.java +++ b/rxjava-core/src/main/java/rx/subjects/ReplaySubject.java @@ -24,7 +24,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.functions.Functions; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.schedulers.Timestamped; import rx.subjects.ReplaySubject.NodeList.Node; import rx.subjects.SubjectSubscriptionManager.SubjectObserver; diff --git a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java index 77a6ae4e43..589ca0dbe9 100644 --- a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java +++ b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java @@ -18,14 +18,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import rx.Observable.OnSubscribe; +import rx.Observable.OnSubscribe; import rx.Observer; import rx.Subscriber; import rx.functions.Action0; import rx.functions.Action1; import rx.functions.Actions; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.subscriptions.Subscriptions; /** diff --git a/rxjava-core/src/main/java/rx/subjects/TestSubject.java b/rxjava-core/src/main/java/rx/subjects/TestSubject.java index 334e6c9963..b31739c354 100644 --- a/rxjava-core/src/main/java/rx/subjects/TestSubject.java +++ b/rxjava-core/src/main/java/rx/subjects/TestSubject.java @@ -21,7 +21,7 @@ import rx.Scheduler; import rx.functions.Action0; import rx.functions.Action1; -import rx.operators.NotificationLite; +import rx.internal.operators.NotificationLite; import rx.schedulers.TestScheduler; import rx.subjects.SubjectSubscriptionManager.SubjectObserver; diff --git a/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java b/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java index 1e3576ba56..cc07071465 100644 --- a/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java +++ b/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java @@ -19,6 +19,7 @@ import rx.Observable.Operator; import rx.functions.Func1; +import rx.internal.operators.OperatorMap; import rx.jmh.InputWithIncrementingInteger; import rx.observers.TestSubscriber; diff --git a/rxjava-core/src/test/java/rx/operators/BlockingOperatorLatestTest.java b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorLatestTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/BlockingOperatorLatestTest.java rename to rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorLatestTest.java index 433659e755..e62a5a94f1 100644 --- a/rxjava-core/src/test/java/rx/operators/BlockingOperatorLatestTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorLatestTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/rxjava-core/src/test/java/rx/operators/BlockingOperatorMostRecentTest.java b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorMostRecentTest.java similarity index 96% rename from rxjava-core/src/test/java/rx/operators/BlockingOperatorMostRecentTest.java rename to rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorMostRecentTest.java index 60e1e2f5ac..60415eba85 100644 --- a/rxjava-core/src/test/java/rx/operators/BlockingOperatorMostRecentTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorMostRecentTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static rx.operators.BlockingOperatorMostRecent.mostRecent; +import static rx.internal.operators.BlockingOperatorMostRecent.mostRecent; import java.util.Iterator; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/test/java/rx/operators/BlockingOperatorNextTest.java b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/BlockingOperatorNextTest.java rename to rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java index a4e8139232..5ed0fcbc59 100644 --- a/rxjava-core/src/test/java/rx/operators/BlockingOperatorNextTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorNextTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static rx.operators.BlockingOperatorNext.next; +import static rx.internal.operators.BlockingOperatorNext.next; import java.util.Iterator; import java.util.NoSuchElementException; @@ -34,6 +34,7 @@ import rx.Observable; import rx.Subscriber; import rx.exceptions.TestException; +import rx.internal.operators.BlockingOperatorNext; import rx.observables.BlockingObservable; import rx.schedulers.Schedulers; import rx.subjects.PublishSubject; diff --git a/rxjava-core/src/test/java/rx/operators/BlockingOperatorToFutureTest.java b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java similarity index 97% rename from rxjava-core/src/test/java/rx/operators/BlockingOperatorToFutureTest.java rename to rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java index f32bfa56bb..b0d56c9148 100644 --- a/rxjava-core/src/test/java/rx/operators/BlockingOperatorToFutureTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToFutureTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static rx.operators.BlockingOperatorToFuture.toFuture; +import static rx.internal.operators.BlockingOperatorToFuture.toFuture; import java.util.List; import java.util.concurrent.CancellationException; diff --git a/rxjava-core/src/test/java/rx/operators/BlockingOperatorToIteratorTest.java b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java similarity index 94% rename from rxjava-core/src/test/java/rx/operators/BlockingOperatorToIteratorTest.java rename to rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java index dd95b66d39..78caa38459 100644 --- a/rxjava-core/src/test/java/rx/operators/BlockingOperatorToIteratorTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/BlockingOperatorToIteratorTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; -import static rx.operators.BlockingOperatorToIterator.toIterator; +import static rx.internal.operators.BlockingOperatorToIterator.toIterator; import java.util.Iterator; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeAmbTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeAmbTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java index e8a0741f21..7c3f6a5e7e 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeAmbTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeAmbTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; -import static rx.operators.OnSubscribeAmb.amb; +import static rx.internal.operators.OnSubscribeAmb.amb; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeCacheTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeCacheTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java index 311a34cd18..fdf3202cc4 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeCacheTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,6 +32,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.functions.Func2; +import rx.internal.operators.OnSubscribeCache; import rx.observers.TestObserver; import rx.schedulers.Schedulers; import rx.subjects.AsyncSubject; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeCombineLatestTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCombineLatestTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeCombineLatestTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCombineLatestTest.java index 31296694de..dbb883adb9 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeCombineLatestTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeCombineLatestTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeDeferTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDeferTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeDeferTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDeferTest.java index 5bdaff74ce..e43a50398b 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeDeferTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDeferTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeDelayTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDelayTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeDelayTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDelayTest.java index 87bd004ae1..6094c936a2 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeDelayTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeDelayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeFromIterableTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java similarity index 96% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeFromIterableTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java index 1d45f1375d..3b1b3466b3 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeFromIterableTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -27,6 +27,7 @@ import rx.Observable; import rx.Observer; +import rx.internal.operators.OnSubscribeFromIterable; public class OnSubscribeFromIterableTest { diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeGroupJoinTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeGroupJoinTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeGroupJoinTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeGroupJoinTest.java index d007d12629..9a1d7aa9ef 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeGroupJoinTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeGroupJoinTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeJoinTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeJoinTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeJoinTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeJoinTest.java index 1bfdfdd16d..76f12728f9 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeJoinTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeJoinTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeMulticastTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeMulticastTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeMulticastTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeMulticastTest.java index f4d8ab9df1..5e9600c755 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeMulticastTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeMulticastTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeRangeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeRangeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java index f7f94ad72c..c62ac5bce4 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeRangeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeTimerTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeTimerTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeTimerTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeTimerTest.java index 6bb5a82c07..1dda1fa4a9 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeTimerTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeTimerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeToObservableFutureTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeToObservableFutureTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java index f2fff63542..7dc259d5d2 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeToObservableFutureTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeToObservableFutureTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; diff --git a/rxjava-core/src/test/java/rx/operators/OnSubscribeUsingTest.java b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OnSubscribeUsingTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java index c377a8e224..22b41a3d20 100644 --- a/rxjava-core/src/test/java/rx/operators/OnSubscribeUsingTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.fail; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorAllTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorAllTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorAllTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorAllTest.java index a36933ce27..e597f6bd62 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorAllTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorAllTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorAnyTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorAnyTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorAnyTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorAnyTest.java index 94c0f76824..901badb6ca 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorAnyTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorAnyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorAsObservableTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorAsObservableTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorAsObservableTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorAsObservableTest.java index b42f78c658..30f5d3cf84 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorAsObservableTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorAsObservableTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorBufferTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorBufferTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorBufferTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorBufferTest.java index ef21c947ed..6e391f42d3 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorBufferTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorBufferTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorCastTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorCastTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorCastTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorCastTest.java index 9753243274..873e655c4c 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorCastTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorCastTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorConcatTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorConcatTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorConcatTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorConcatTest.java index d9763720f7..40c7da7ca0 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorConcatTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorConcatTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDebounceTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDebounceTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorDebounceTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDebounceTest.java index 2df439c8f1..174820f310 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDebounceTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDebounceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDefaultIfEmptyTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDefaultIfEmptyTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorDefaultIfEmptyTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDefaultIfEmptyTest.java index 8ef622d1a5..47fa356ae1 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDefaultIfEmptyTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDefaultIfEmptyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDematerializeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDematerializeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorDematerializeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDematerializeTest.java index 99456e59cc..041190d158 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDematerializeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDematerializeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDistinctTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorDistinctTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctTest.java index bef7e2ea7f..e7c98ac294 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDistinctTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDistinctUntilChangedTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctUntilChangedTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorDistinctUntilChangedTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctUntilChangedTest.java index e5bfd1bf4c..40f6567453 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDistinctUntilChangedTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDistinctUntilChangedTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorDoOnEachTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorDoOnEachTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorDoOnEachTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorDoOnEachTest.java index dd4f66fbec..c3e4410096 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorDoOnEachTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorDoOnEachTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorElementAtTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorElementAtTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorElementAtTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorElementAtTest.java index d239988aca..b248da2797 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorElementAtTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorElementAtTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorFilterTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorFilterTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorFilterTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorFilterTest.java index c09ee47004..acb6f6f89f 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorFilterTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorFilterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorFinallyTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorFinallyTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorFinallyTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorFinallyTest.java index 6e8cefa9d9..5403e7ebe6 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorFinallyTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorFinallyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorFirstTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorFirstTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorFirstTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorFirstTest.java index 2b91be44a2..6e9a09b095 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorFirstTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorFirstTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorGroupByTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorGroupByTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByTest.java index 2e1249d2fc..1307755a9b 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorGroupByTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -47,6 +47,7 @@ import rx.functions.Action0; import rx.functions.Action1; import rx.functions.Func1; +import rx.internal.operators.OperatorGroupBy; import rx.observables.GroupedObservable; import rx.schedulers.Schedulers; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorGroupByUntilTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByUntilTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorGroupByUntilTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByUntilTest.java index e252c79f68..5f17330e1d 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorGroupByUntilTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorGroupByUntilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorLastTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorLastTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorLastTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorLastTest.java index f4837daf37..924083790e 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorLastTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorLastTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.isA; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMapTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMapTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMapTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMapTest.java index 9a087d2587..5731330fd8 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMapTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; @@ -36,6 +36,7 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.functions.Func2; +import rx.internal.operators.OperatorMap; import rx.schedulers.Schedulers; public class OperatorMapTest { diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMaterializeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMaterializeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMaterializeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMaterializeTest.java index f3fa354ec6..a900da61d6 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMaterializeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMaterializeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMergeDelayErrorTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMergeDelayErrorTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java index 70d47ecafb..29c2fdf1c9 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMergeDelayErrorTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMergeMapTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMapTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMergeMapTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMapTest.java index d99b6c29c6..d1849a2c91 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMergeMapTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMergeMaxConcurrentTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMergeMaxConcurrentTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java index a51f791f5f..e4f8d3a348 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMergeMaxConcurrentTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorMergeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorMergeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorMergeTest.java index 7358194399..cefa61ee3b 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorMergeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorMergeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorObserveOnTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorObserveOnTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorObserveOnTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorObserveOnTest.java index 8e07a71b1f..e07af38a10 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorObserveOnTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorObserveOnTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorFlatMapTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorFlatMapTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorOnErrorFlatMapTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorFlatMapTest.java index 38f6523e5e..263dbba3cf 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorFlatMapTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorFlatMapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaFunctionTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaFunctionTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java index 2e022107da..0d0c835490 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaFunctionTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaObservableTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaObservableTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java index 9695895784..53af3074b6 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaObservableTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservableTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorReturnTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorOnErrorReturnTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java index 4adf5e4b9f..7068f38edd 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorOnErrorReturnTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorOnExceptionResumeNextViaObservableTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorOnExceptionResumeNextViaObservableTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java index bcbe2c62c9..26d8e781d9 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorOnExceptionResumeNextViaObservableTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservableTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorParallelMergeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorParallelMergeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorParallelMergeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorParallelMergeTest.java index c64e3e217b..0131b0f324 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorParallelMergeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorParallelMergeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorParallelTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorParallelTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorParallelTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorParallelTest.java index 4d8ab49fb4..7c27ba8598 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorParallelTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorParallelTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorPivotTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorPivotTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorPivotTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorPivotTest.java index c2432d7787..f35f3912be 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorPivotTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorPivotTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import java.util.Random; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorReduceTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorReduceTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java index 1a18e3c973..f5fcc2b2b1 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorReduceTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorRepeatTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorRepeatTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorRepeatTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorRepeatTest.java index e2916cea60..7cb24e1578 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorRepeatTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorRepeatTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorReplayTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorReplayTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorReplayTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorReplayTest.java index 216cc3321d..7fbdd0ea0b 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorReplayTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorReplayTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorRetryTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorRetryTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorRetryTest.java index 841c69cd56..bfc0fde7b0 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorRetryTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -40,6 +40,7 @@ import rx.Subscription; import rx.functions.Action0; import rx.functions.Action1; +import rx.internal.operators.OperatorRetry; import rx.observers.TestSubscriber; import rx.subjects.PublishSubject; import rx.subscriptions.Subscriptions; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorRetryWithPredicateTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorRetryWithPredicateTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java index 0aff7a2404..aca7844f1b 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorRetryWithPredicateTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorRetryWithPredicateTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package rx.operators; +package rx.internal.operators; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSampleTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSampleTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSampleTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSampleTest.java index 41deae520c..0a8c9da58d 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSampleTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSampleTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorScanTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorScanTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorScanTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorScanTest.java index 3f6efc4a72..cd8cd98e4e 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorScanTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorScanTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSequenceEqualTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSequenceEqualTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSequenceEqualTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSequenceEqualTest.java index 731651c27f..4d58c54038 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSequenceEqualTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSequenceEqualTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSerializeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSerializeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSerializeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSerializeTest.java index f42a56c6e7..d5f15a24cd 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSerializeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSerializeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSingleTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSingleTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSingleTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSingleTest.java index b7a6ee4fc7..a900e4c706 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSingleTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSingleTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipLastTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipLastTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTest.java index ef18d5984a..2178920501 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipLastTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipLastTimedTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTimedTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipLastTimedTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTimedTest.java index 9eaa8a98a2..fce0a05f9b 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipLastTimedTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipLastTimedTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTest.java index 6ec02256d8..1740156098 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -25,6 +25,7 @@ import rx.Observable; import rx.Observer; +import rx.internal.operators.OperatorSkip; public class OperatorSkipTest { diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipTimedTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTimedTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipTimedTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTimedTest.java index d248110f8b..b75c84eef8 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipTimedTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipTimedTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipUntilTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipUntilTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipUntilTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipUntilTest.java index eb01cd783b..762798ace7 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipUntilTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipUntilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSkipWhileTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipWhileTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSkipWhileTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSkipWhileTest.java index a3ea8094d1..b531618bc9 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSkipWhileTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSkipWhileTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSubscribeOnTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSubscribeOnTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java index 8315f43fa7..37e15be625 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSubscribeOnTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorSwitchTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorSwitchTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorSwitchTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorSwitchTest.java index cb0283e61e..ddb12c78f2 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorSwitchTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorSwitchTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeLastTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeLastTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTest.java index 6f25b851a0..681d5b5b57 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeLastTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import org.junit.Test; import org.mockito.InOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeLastTimedTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTimedTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeLastTimedTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTimedTest.java index f188bbd8ce..76412ca7cf 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeLastTimedTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeLastTimedTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTest.java index 2f663e7097..ac9b5f4c92 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -42,6 +42,7 @@ import rx.Subscription; import rx.functions.Action1; import rx.functions.Func1; +import rx.internal.operators.OperatorTake; import rx.observers.Subscribers; import rx.schedulers.Schedulers; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeTimedTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTimedTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeTimedTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTimedTest.java index d604ea6d0a..214e295bd6 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeTimedTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeTimedTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeUntilTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeUntilTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java index dab3882216..90bfb786f1 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeUntilTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static rx.operators.OperatorTakeUntil.takeUntil; +import static rx.internal.operators.OperatorTakeUntil.takeUntil; import org.junit.Test; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTakeWhileTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTakeWhileTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java index b04e5f9965..eb5a0e0b5c 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTakeWhileTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorThrottleFirstTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorThrottleFirstTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java index 28cb730186..0090d57546 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorThrottleFirstTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorThrottleFirstTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTimeIntervalTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeIntervalTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorTimeIntervalTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTimeIntervalTest.java index 456da7466b..68c91bbd07 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTimeIntervalTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeIntervalTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTimeoutTests.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutTests.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTimeoutTests.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutTests.java index 11ae3bd37e..251207fc91 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTimeoutTests.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Matchers.isA; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTimeoutWithSelectorTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTimeoutWithSelectorTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java index 75a721a54b..4373dfc7b4 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTimeoutWithSelectorTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimeoutWithSelectorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTimestampTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimestampTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorTimestampTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorTimestampTest.java index 6421579bb3..bf39ae299a 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorTimestampTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorTimestampTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorToMapTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorToMapTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorToMapTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorToMapTest.java index af62ca1061..d58ae8edcf 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorToMapTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorToMapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorToMultimapTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorToMultimapTest.java similarity index 98% rename from rxjava-core/src/test/java/rx/operators/OperatorToMultimapTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorToMultimapTest.java index aa7f65a426..662b5452ea 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorToMultimapTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorToMultimapTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; @@ -39,8 +39,8 @@ import rx.functions.Func0; import rx.functions.Func1; import rx.functions.Functions; -import rx.operators.OperatorToMultimap.DefaultMultimapCollectionFactory; -import rx.operators.OperatorToMultimap.DefaultToMultimapFactory; +import rx.internal.operators.OperatorToMultimap.DefaultMultimapCollectionFactory; +import rx.internal.operators.OperatorToMultimap.DefaultToMultimapFactory; public class OperatorToMultimapTest { @Mock diff --git a/rxjava-core/src/test/java/rx/operators/OperatorToObservableListTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableListTest.java similarity index 97% rename from rxjava-core/src/test/java/rx/operators/OperatorToObservableListTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableListTest.java index 7c90822378..8039066add 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorToObservableListTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableListTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -28,6 +28,7 @@ import rx.Observable; import rx.Observer; +import rx.internal.operators.OperatorToObservableList; public class OperatorToObservableListTest { diff --git a/rxjava-core/src/test/java/rx/operators/OperatorToObservableSortedListTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableSortedListTest.java similarity index 96% rename from rxjava-core/src/test/java/rx/operators/OperatorToObservableSortedListTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableSortedListTest.java index 4cbc3951a3..4e140c3369 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorToObservableSortedListTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorToObservableSortedListTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -29,6 +29,7 @@ import rx.Observable; import rx.Observer; import rx.functions.Func2; +import rx.internal.operators.OperatorToObservableSortedList; public class OperatorToObservableSortedListTest { diff --git a/rxjava-core/src/test/java/rx/operators/OperatorUnsubscribeOnTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorUnsubscribeOnTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java index d07a64cc68..08bce82609 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorUnsubscribeOnTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorWindowTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorWindowTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorWindowTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorWindowTest.java index fbb094dcbd..61f9d06771 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorWindowTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorWindowTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorZipCompletionTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipCompletionTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorZipCompletionTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorZipCompletionTest.java index 3ca1086ae3..ef5ddb6847 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorZipCompletionTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipCompletionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorZipIterableTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipIterableTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorZipIterableTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorZipIterableTest.java index 39f81086f9..f2fdd321de 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorZipIterableTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipIterableTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; diff --git a/rxjava-core/src/test/java/rx/operators/OperatorZipTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/OperatorZipTest.java rename to rxjava-core/src/test/java/rx/internal/operators/OperatorZipTest.java index 2068a98d80..6fdfec985a 100644 --- a/rxjava-core/src/test/java/rx/operators/OperatorZipTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorZipTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; diff --git a/rxjava-core/src/test/java/rx/operators/SafeSubscriberTest.java b/rxjava-core/src/test/java/rx/internal/operators/SafeSubscriberTest.java similarity index 99% rename from rxjava-core/src/test/java/rx/operators/SafeSubscriberTest.java rename to rxjava-core/src/test/java/rx/internal/operators/SafeSubscriberTest.java index ced81bb3df..43ad503f79 100644 --- a/rxjava-core/src/test/java/rx/operators/SafeSubscriberTest.java +++ b/rxjava-core/src/test/java/rx/internal/operators/SafeSubscriberTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package rx.operators; +package rx.internal.operators; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock;