From e1de896dbb4390c48797825d78a7d0c07292a5ce Mon Sep 17 00:00:00 2001 From: akarnokd Date: Fri, 16 Aug 2019 12:57:19 +0200 Subject: [PATCH 1/4] 3.x: Refactor to io.reactivex.rxjava3.** --- .gitignore | 1 + build.gradle | 2 +- .../{ => rxjava3/core}/BinaryFlatMapPerf.java | 5 +- .../{ => rxjava3/core}/BlockingGetPerf.java | 2 +- .../{ => rxjava3/core}/BlockingPerf.java | 2 +- .../{ => rxjava3/core}/CallableAsyncPerf.java | 6 +- .../core}/EachTypeFlatMapPerf.java | 4 +- .../{ => rxjava3/core}/FlatMapJustPerf.java | 4 +- .../core}/FlattenCrossMapPerf.java | 6 +- .../{ => rxjava3/core}/FlattenJustPerf.java | 4 +- .../{ => rxjava3/core}/FlattenRangePerf.java | 6 +- .../FlowableFlatMapCompletableAsyncPerf.java | 8 +- .../FlowableFlatMapCompletableSyncPerf.java | 4 +- .../core}/InputWithIncrementingInteger.java | 6 +- .../{ => rxjava3/core}/JustAsyncPerf.java | 6 +- .../core}/LatchedSingleObserver.java | 4 +- .../{ => rxjava3/core}/MemoryPerf.java | 100 +++++++++--------- .../core}/ObservableFlatMapPerf.java | 4 +- .../core}/OperatorFlatMapPerf.java | 7 +- .../{ => rxjava3/core}/OperatorMergePerf.java | 7 +- .../{ => rxjava3/core}/PerfAsyncConsumer.java | 8 +- .../core}/PerfBoundedSubscriber.java | 2 +- .../{ => rxjava3/core}/PerfConsumer.java | 4 +- .../core}/PerfInteropConsumer.java | 4 +- .../{ => rxjava3/core}/PerfObserver.java | 4 +- .../{ => rxjava3/core}/PerfSubscriber.java | 2 +- .../core}/PublishProcessorPerf.java | 6 +- .../{ => rxjava3/core}/RangePerf.java | 7 +- .../{ => rxjava3/core}/ReducePerf.java | 4 +- .../{ => rxjava3/core}/RxVsStreamPerf.java | 4 +- .../{ => rxjava3/core}/StrictPerf.java | 2 +- .../{ => rxjava3/core}/TakeUntilPerf.java | 8 +- .../{ => rxjava3/core}/ToFlowablePerf.java | 4 +- .../{ => rxjava3/core}/XMapYPerf.java | 4 +- .../{ => rxjava3}/parallel/ParallelPerf.java | 10 +- .../FlowableConcatMapCompletablePerf.java | 6 +- .../FlowableConcatMapMaybeEmptyPerf.java | 6 +- .../xmapz/FlowableConcatMapMaybePerf.java | 6 +- .../xmapz/FlowableConcatMapSinglePerf.java | 6 +- .../xmapz/FlowableFlatMapCompletablePerf.java | 6 +- .../xmapz/FlowableFlatMapMaybeEmptyPerf.java | 6 +- .../xmapz/FlowableFlatMapMaybePerf.java | 6 +- .../xmapz/FlowableFlatMapSinglePerf.java | 6 +- .../FlowableSwitchMapCompletablePerf.java | 6 +- .../FlowableSwitchMapMaybeEmptyPerf.java | 6 +- .../xmapz/FlowableSwitchMapMaybePerf.java | 6 +- .../xmapz/FlowableSwitchMapSinglePerf.java | 6 +- .../ObservableConcatMapCompletablePerf.java | 6 +- .../ObservableConcatMapMaybeEmptyPerf.java | 6 +- .../xmapz/ObservableConcatMapMaybePerf.java | 6 +- .../xmapz/ObservableConcatMapSinglePerf.java | 6 +- .../ObservableFlatMapCompletablePerf.java | 6 +- .../ObservableFlatMapMaybeEmptyPerf.java | 6 +- .../xmapz/ObservableFlatMapMaybePerf.java | 6 +- .../xmapz/ObservableFlatMapSinglePerf.java | 6 +- .../ObservableSwitchMapCompletablePerf.java | 6 +- .../ObservableSwitchMapMaybeEmptyPerf.java | 6 +- .../xmapz/ObservableSwitchMapMaybePerf.java | 6 +- .../xmapz/ObservableSwitchMapSinglePerf.java | 6 +- .../io/reactivex/parallel/package-info.java | 21 ---- .../annotations/BackpressureKind.java | 2 +- .../annotations/BackpressureSupport.java | 2 +- .../{ => rxjava3}/annotations/Beta.java | 2 +- .../annotations/CheckReturnValue.java | 8 +- .../annotations/Experimental.java | 2 +- .../{ => rxjava3}/annotations/NonNull.java | 13 +-- .../{ => rxjava3}/annotations/Nullable.java | 13 +-- .../annotations/SchedulerSupport.java | 4 +- .../annotations/package-info.java | 2 +- .../core}/BackpressureOverflowStrategy.java | 2 +- .../core}/BackpressureStrategy.java | 2 +- .../{ => rxjava3/core}/Completable.java | 46 ++++---- .../core}/CompletableConverter.java | 4 +- .../core}/CompletableEmitter.java | 14 +-- .../core}/CompletableObserver.java | 6 +- .../core}/CompletableOnSubscribe.java | 4 +- .../core}/CompletableOperator.java | 4 +- .../{ => rxjava3/core}/CompletableSource.java | 4 +- .../core}/CompletableTransformer.java | 4 +- .../reactivex/{ => rxjava3/core}/Emitter.java | 4 +- .../{ => rxjava3/core}/Flowable.java | 76 ++++++------- .../{ => rxjava3/core}/FlowableConverter.java | 4 +- .../{ => rxjava3/core}/FlowableEmitter.java | 12 +-- .../core}/FlowableOnSubscribe.java | 4 +- .../{ => rxjava3/core}/FlowableOperator.java | 5 +- .../core}/FlowableSubscriber.java | 5 +- .../core}/FlowableTransformer.java | 5 +- .../reactivex/{ => rxjava3/core}/Maybe.java | 60 +++++------ .../{ => rxjava3/core}/MaybeConverter.java | 4 +- .../{ => rxjava3/core}/MaybeEmitter.java | 14 +-- .../{ => rxjava3/core}/MaybeObserver.java | 6 +- .../{ => rxjava3/core}/MaybeOnSubscribe.java | 4 +- .../{ => rxjava3/core}/MaybeOperator.java | 4 +- .../{ => rxjava3/core}/MaybeSource.java | 4 +- .../{ => rxjava3/core}/MaybeTransformer.java | 4 +- .../{ => rxjava3/core}/Notification.java | 8 +- .../{ => rxjava3/core}/Observable.java | 58 +++++----- .../core}/ObservableConverter.java | 4 +- .../{ => rxjava3/core}/ObservableEmitter.java | 12 +-- .../core}/ObservableOnSubscribe.java | 4 +- .../core}/ObservableOperator.java | 4 +- .../{ => rxjava3/core}/ObservableSource.java | 4 +- .../core}/ObservableTransformer.java | 4 +- .../{ => rxjava3/core}/Observer.java | 10 +- .../{ => rxjava3/core}/Scheduler.java | 34 +++--- .../reactivex/{ => rxjava3/core}/Single.java | 52 ++++----- .../{ => rxjava3/core}/SingleConverter.java | 4 +- .../{ => rxjava3/core}/SingleEmitter.java | 14 +-- .../{ => rxjava3/core}/SingleObserver.java | 6 +- .../{ => rxjava3/core}/SingleOnSubscribe.java | 4 +- .../{ => rxjava3/core}/SingleOperator.java | 4 +- .../{ => rxjava3/core}/SingleSource.java | 4 +- .../{ => rxjava3/core}/SingleTransformer.java | 4 +- .../{ => rxjava3/core}/package-info.java | 14 +-- .../disposables/ActionDisposable.java | 8 +- .../disposables/CompositeDisposable.java | 12 +-- .../{ => rxjava3}/disposables/Disposable.java | 2 +- .../disposables/Disposables.java | 11 +- .../disposables/FutureDisposable.java | 2 +- .../disposables/ReferenceDisposable.java | 6 +- .../disposables/RunnableDisposable.java | 4 +- .../disposables/SerialDisposable.java | 6 +- .../disposables/SubscriptionDisposable.java | 5 +- .../disposables/package-info.java | 2 +- .../exceptions/CompositeException.java | 4 +- .../{ => rxjava3}/exceptions/Exceptions.java | 6 +- .../MissingBackpressureException.java | 2 +- .../OnErrorNotImplementedException.java | 4 +- .../ProtocolViolationException.java | 2 +- .../exceptions/UndeliverableException.java | 2 +- .../exceptions/package-info.java | 2 +- .../flowables/ConnectableFlowable.java | 22 ++-- .../flowables/GroupedFlowable.java | 8 +- .../{ => rxjava3}/flowables/package-info.java | 6 +- .../{ => rxjava3}/functions/Action.java | 2 +- .../{ => rxjava3}/functions/BiConsumer.java | 2 +- .../{ => rxjava3}/functions/BiFunction.java | 4 +- .../{ => rxjava3}/functions/BiPredicate.java | 4 +- .../functions/BooleanSupplier.java | 2 +- .../{ => rxjava3}/functions/Cancellable.java | 2 +- .../{ => rxjava3}/functions/Consumer.java | 2 +- .../{ => rxjava3}/functions/Function.java | 4 +- .../{ => rxjava3}/functions/Function3.java | 4 +- .../{ => rxjava3}/functions/Function4.java | 4 +- .../{ => rxjava3}/functions/Function5.java | 4 +- .../{ => rxjava3}/functions/Function6.java | 4 +- .../{ => rxjava3}/functions/Function7.java | 4 +- .../{ => rxjava3}/functions/Function8.java | 4 +- .../{ => rxjava3}/functions/Function9.java | 4 +- .../{ => rxjava3}/functions/IntFunction.java | 4 +- .../{ => rxjava3}/functions/LongConsumer.java | 2 +- .../{ => rxjava3}/functions/Predicate.java | 4 +- .../{ => rxjava3}/functions/Supplier.java | 2 +- .../{ => rxjava3}/functions/package-info.java | 2 +- .../disposables/ArrayCompositeDisposable.java | 4 +- .../disposables/CancellableDisposable.java | 10 +- .../disposables/DisposableContainer.java | 4 +- .../disposables/DisposableHelper.java | 10 +- .../internal/disposables/EmptyDisposable.java | 8 +- .../disposables/ListCompositeDisposable.java | 10 +- .../disposables/SequentialDisposable.java | 4 +- .../internal/functions/Functions.java | 12 +-- .../internal/functions/ObjectHelper.java | 4 +- .../fuseable/ConditionalSubscriber.java | 4 +- .../internal/fuseable/FuseToFlowable.java | 4 +- .../internal/fuseable/FuseToMaybe.java | 4 +- .../internal/fuseable/FuseToObservable.java | 4 +- .../HasUpstreamCompletableSource.java | 4 +- .../fuseable/HasUpstreamMaybeSource.java | 4 +- .../fuseable/HasUpstreamObservableSource.java | 4 +- .../fuseable/HasUpstreamPublisher.java | 2 +- .../fuseable/HasUpstreamSingleSource.java | 4 +- .../internal/fuseable/QueueDisposable.java | 4 +- .../internal/fuseable/QueueFuseable.java | 2 +- .../internal/fuseable/QueueSubscription.java | 2 +- .../internal/fuseable/ScalarSupplier.java | 4 +- .../internal/fuseable/SimplePlainQueue.java | 4 +- .../internal/fuseable/SimpleQueue.java | 4 +- .../internal/fuseable/package-info.java | 2 +- .../observers/BasicFuseableObserver.java | 16 +-- .../observers/BasicIntQueueDisposable.java | 4 +- .../observers/BasicQueueDisposable.java | 4 +- .../observers/BiConsumerSingleObserver.java | 14 +-- .../observers/BlockingBaseObserver.java | 8 +- .../observers/BlockingFirstObserver.java | 2 +- .../observers/BlockingLastObserver.java | 2 +- .../observers/BlockingMultiObserver.java | 8 +- .../internal/observers/BlockingObserver.java | 10 +- .../CallbackCompletableObserver.java | 16 +-- .../observers/ConsumerSingleObserver.java | 18 ++-- .../observers/DeferredScalarDisposable.java | 8 +- .../observers/DeferredScalarObserver.java | 8 +- .../observers/DisposableLambdaObserver.java | 14 +-- .../observers/EmptyCompletableObserver.java | 14 +-- .../observers/ForEachWhileObserver.java | 14 +-- .../internal/observers/FutureObserver.java | 16 +-- .../observers/FutureSingleObserver.java | 16 +-- .../observers/InnerQueuedObserver.java | 12 +-- .../observers/InnerQueuedObserverSupport.java | 2 +- .../internal/observers/LambdaObserver.java | 18 ++-- .../observers/QueueDrainObserver.java | 10 +- .../observers/ResumeSingleObserver.java | 8 +- .../SubscriberCompletableObserver.java | 8 +- .../operators/completable/CompletableAmb.java | 12 +-- .../CompletableAndThenCompletable.java | 8 +- .../completable/CompletableCache.java | 6 +- .../completable/CompletableConcat.java | 18 ++-- .../completable/CompletableConcatArray.java | 8 +- .../CompletableConcatIterable.java | 12 +-- .../completable/CompletableCreate.java | 14 +-- .../completable/CompletableDefer.java | 12 +-- .../completable/CompletableDelay.java | 8 +- .../completable/CompletableDetach.java | 8 +- .../completable/CompletableDisposeOn.java | 10 +- .../completable/CompletableDoFinally.java | 14 +-- .../completable/CompletableDoOnEvent.java | 13 +-- .../completable/CompletableEmpty.java | 6 +- .../completable/CompletableError.java | 6 +- .../completable/CompletableErrorSupplier.java | 12 +-- .../completable/CompletableFromAction.java | 12 +-- .../completable/CompletableFromCallable.java | 10 +- .../CompletableFromObservable.java | 6 +- .../completable/CompletableFromPublisher.java | 8 +- .../completable/CompletableFromRunnable.java | 12 +-- .../completable/CompletableFromSingle.java | 6 +- .../completable/CompletableFromSupplier.java | 12 +-- .../CompletableFromUnsafeSource.java | 4 +- .../completable/CompletableHide.java | 10 +- .../completable/CompletableLift.java | 8 +- .../completable/CompletableMaterialize.java | 6 +- .../completable/CompletableMerge.java | 14 +-- .../completable/CompletableMergeArray.java | 8 +- .../CompletableMergeDelayErrorArray.java | 10 +- .../CompletableMergeDelayErrorIterable.java | 14 +-- .../completable/CompletableMergeIterable.java | 12 +-- .../completable/CompletableNever.java | 6 +- .../completable/CompletableObserveOn.java | 8 +- .../CompletableOnErrorComplete.java | 10 +- .../completable/CompletablePeek.java | 16 +-- .../completable/CompletableResumeNext.java | 14 +-- .../completable/CompletableSubscribeOn.java | 8 +- .../CompletableTakeUntilCompletable.java | 10 +- .../completable/CompletableTimeout.java | 12 +-- .../completable/CompletableTimer.java | 8 +- .../completable/CompletableToFlowable.java | 6 +- .../completable/CompletableToObservable.java | 10 +- .../completable/CompletableToSingle.java | 10 +- .../completable/CompletableUsing.java | 16 +-- .../AbstractFlowableWithUpstream.java | 8 +- .../flowable/BlockingFlowableIterable.java | 14 +-- .../flowable/BlockingFlowableLatest.java | 10 +- .../flowable/BlockingFlowableMostRecent.java | 8 +- .../flowable/BlockingFlowableNext.java | 10 +- .../operators/flowable/FlowableAll.java | 12 +-- .../operators/flowable/FlowableAllSingle.java | 18 ++-- .../operators/flowable/FlowableAmb.java | 10 +- .../operators/flowable/FlowableAny.java | 12 +-- .../operators/flowable/FlowableAnySingle.java | 18 ++-- .../flowable/FlowableAutoConnect.java | 10 +- .../flowable/FlowableBlockingSubscribe.java | 10 +- .../operators/flowable/FlowableBuffer.java | 16 +-- .../flowable/FlowableBufferBoundary.java | 20 ++-- .../flowable/FlowableBufferExactBoundary.java | 22 ++-- .../flowable/FlowableBufferTimed.java | 28 ++--- .../operators/flowable/FlowableCache.java | 10 +- .../operators/flowable/FlowableCollect.java | 14 +-- .../flowable/FlowableCollectSingle.java | 20 ++-- .../flowable/FlowableCombineLatest.java | 22 ++-- .../flowable/FlowableConcatArray.java | 8 +- .../operators/flowable/FlowableConcatMap.java | 20 ++-- .../flowable/FlowableConcatMapEager.java | 22 ++-- .../FlowableConcatMapEagerPublisher.java | 10 +- .../flowable/FlowableConcatMapPublisher.java | 8 +- .../flowable/FlowableConcatMapScheduler.java | 22 ++-- .../FlowableConcatWithCompletable.java | 10 +- .../flowable/FlowableConcatWithMaybe.java | 16 +-- .../flowable/FlowableConcatWithSingle.java | 16 +-- .../operators/flowable/FlowableCount.java | 6 +- .../flowable/FlowableCountSingle.java | 14 +-- .../operators/flowable/FlowableCreate.java | 22 ++-- .../operators/flowable/FlowableDebounce.java | 22 ++-- .../flowable/FlowableDebounceTimed.java | 20 ++-- .../operators/flowable/FlowableDefer.java | 12 +-- .../operators/flowable/FlowableDelay.java | 10 +- .../FlowableDelaySubscriptionOther.java | 8 +- .../flowable/FlowableDematerialize.java | 14 +-- .../operators/flowable/FlowableDetach.java | 8 +- .../operators/flowable/FlowableDistinct.java | 20 ++-- .../FlowableDistinctUntilChanged.java | 12 +-- .../flowable/FlowableDoAfterNext.java | 12 +-- .../operators/flowable/FlowableDoFinally.java | 16 +-- .../operators/flowable/FlowableDoOnEach.java | 18 ++-- .../flowable/FlowableDoOnLifecycle.java | 12 +-- .../operators/flowable/FlowableElementAt.java | 8 +- .../flowable/FlowableElementAtMaybe.java | 14 +-- .../flowable/FlowableElementAtSingle.java | 14 +-- .../operators/flowable/FlowableEmpty.java | 8 +- .../operators/flowable/FlowableError.java | 12 +-- .../operators/flowable/FlowableFilter.java | 12 +-- .../operators/flowable/FlowableFlatMap.java | 22 ++-- .../flowable/FlowableFlatMapCompletable.java | 22 ++-- ...FlowableFlatMapCompletableCompletable.java | 26 ++--- .../flowable/FlowableFlatMapMaybe.java | 22 ++-- .../flowable/FlowableFlatMapPublisher.java | 6 +- .../flowable/FlowableFlatMapSingle.java | 22 ++-- .../flowable/FlowableFlattenIterable.java | 22 ++-- .../operators/flowable/FlowableFromArray.java | 14 +-- .../flowable/FlowableFromCallable.java | 14 +-- .../flowable/FlowableFromFuture.java | 8 +- .../flowable/FlowableFromIterable.java | 16 +-- .../flowable/FlowableFromObservable.java | 6 +- .../flowable/FlowableFromPublisher.java | 4 +- .../flowable/FlowableFromSupplier.java | 14 +-- .../operators/flowable/FlowableGenerate.java | 14 +-- .../operators/flowable/FlowableGroupBy.java | 30 +++--- .../operators/flowable/FlowableGroupJoin.java | 24 ++--- .../operators/flowable/FlowableHide.java | 6 +- .../flowable/FlowableIgnoreElements.java | 10 +- .../FlowableIgnoreElementsCompletable.java | 14 +-- .../flowable/FlowableInternalHelper.java | 12 +-- .../operators/flowable/FlowableInterval.java | 18 ++-- .../flowable/FlowableIntervalRange.java | 18 ++-- .../operators/flowable/FlowableJoin.java | 24 ++--- .../operators/flowable/FlowableJust.java | 8 +- .../operators/flowable/FlowableLastMaybe.java | 8 +- .../flowable/FlowableLastSingle.java | 8 +- .../operators/flowable/FlowableLift.java | 8 +- .../operators/flowable/FlowableLimit.java | 8 +- .../operators/flowable/FlowableMap.java | 14 +-- .../flowable/FlowableMapNotification.java | 12 +-- .../flowable/FlowableMapPublisher.java | 8 +- .../flowable/FlowableMaterialize.java | 8 +- .../FlowableMergeWithCompletable.java | 12 +-- .../flowable/FlowableMergeWithMaybe.java | 18 ++-- .../flowable/FlowableMergeWithSingle.java | 18 ++-- .../operators/flowable/FlowableNever.java | 6 +- .../operators/flowable/FlowableObserveOn.java | 20 ++-- .../FlowableOnBackpressureBuffer.java | 18 ++-- .../FlowableOnBackpressureBufferStrategy.java | 14 +-- .../flowable/FlowableOnBackpressureDrop.java | 14 +-- .../flowable/FlowableOnBackpressureError.java | 12 +-- .../FlowableOnBackpressureLatest.java | 8 +- .../flowable/FlowableOnErrorNext.java | 14 +-- .../flowable/FlowableOnErrorReturn.java | 12 +-- .../operators/flowable/FlowablePublish.java | 22 ++-- .../flowable/FlowablePublishMulticast.java | 20 ++-- .../operators/flowable/FlowableRange.java | 12 +-- .../operators/flowable/FlowableRangeLong.java | 12 +-- .../operators/flowable/FlowableReduce.java | 14 +-- .../flowable/FlowableReduceMaybe.java | 18 ++-- .../flowable/FlowableReduceSeedSingle.java | 16 +-- .../flowable/FlowableReduceWithSingle.java | 14 +-- .../operators/flowable/FlowableRefCount.java | 16 +-- .../operators/flowable/FlowableRepeat.java | 6 +- .../flowable/FlowableRepeatUntil.java | 10 +- .../flowable/FlowableRepeatWhen.java | 16 +-- .../operators/flowable/FlowableReplay.java | 26 ++--- .../flowable/FlowableRetryBiPredicate.java | 10 +- .../flowable/FlowableRetryPredicate.java | 10 +- .../operators/flowable/FlowableRetryWhen.java | 18 ++-- .../flowable/FlowableSamplePublisher.java | 12 +-- .../flowable/FlowableSampleTimed.java | 14 +-- .../flowable/FlowableScalarXMap.java | 14 +-- .../operators/flowable/FlowableScan.java | 14 +-- .../operators/flowable/FlowableScanSeed.java | 20 ++-- .../flowable/FlowableSequenceEqual.java | 18 ++-- .../flowable/FlowableSequenceEqualSingle.java | 20 ++-- .../flowable/FlowableSerialized.java | 6 +- .../operators/flowable/FlowableSingle.java | 8 +- .../flowable/FlowableSingleMaybe.java | 12 +-- .../flowable/FlowableSingleSingle.java | 12 +-- .../operators/flowable/FlowableSkip.java | 6 +- .../operators/flowable/FlowableSkipLast.java | 6 +- .../flowable/FlowableSkipLastTimed.java | 10 +- .../operators/flowable/FlowableSkipUntil.java | 10 +- .../operators/flowable/FlowableSkipWhile.java | 10 +- .../flowable/FlowableSubscribeOn.java | 8 +- .../flowable/FlowableSwitchIfEmpty.java | 6 +- .../operators/flowable/FlowableSwitchMap.java | 20 ++-- .../operators/flowable/FlowableTake.java | 8 +- .../operators/flowable/FlowableTakeLast.java | 8 +- .../flowable/FlowableTakeLastOne.java | 6 +- .../flowable/FlowableTakeLastTimed.java | 10 +- .../flowable/FlowableTakePublisher.java | 6 +- .../operators/flowable/FlowableTakeUntil.java | 8 +- .../flowable/FlowableTakeUntilPredicate.java | 12 +-- .../operators/flowable/FlowableTakeWhile.java | 12 +-- .../flowable/FlowableThrottleFirstTimed.java | 20 ++-- .../flowable/FlowableThrottleLatest.java | 10 +- .../flowable/FlowableTimeInterval.java | 8 +- .../operators/flowable/FlowableTimeout.java | 20 ++-- .../flowable/FlowableTimeoutTimed.java | 14 +-- .../operators/flowable/FlowableTimer.java | 12 +-- .../operators/flowable/FlowableToList.java | 12 +-- .../flowable/FlowableToListSingle.java | 22 ++-- .../flowable/FlowableUnsubscribeOn.java | 8 +- .../operators/flowable/FlowableUsing.java | 14 +-- .../operators/flowable/FlowableWindow.java | 14 +-- .../flowable/FlowableWindowBoundary.java | 18 ++-- .../FlowableWindowBoundarySelector.java | 30 +++--- .../flowable/FlowableWindowTimed.java | 26 ++--- .../flowable/FlowableWithLatestFrom.java | 16 +-- .../flowable/FlowableWithLatestFromMany.java | 20 ++-- .../operators/flowable/FlowableZip.java | 20 ++-- .../flowable/FlowableZipIterable.java | 14 +-- .../maybe/AbstractMaybeWithUpstream.java | 6 +- .../internal/operators/maybe/MaybeAmb.java | 12 +-- .../internal/operators/maybe/MaybeCache.java | 8 +- .../maybe/MaybeCallbackObserver.java | 18 ++-- .../operators/maybe/MaybeConcatArray.java | 12 +-- .../maybe/MaybeConcatArrayDelayError.java | 14 +-- .../operators/maybe/MaybeConcatIterable.java | 16 +-- .../operators/maybe/MaybeContains.java | 12 +-- .../internal/operators/maybe/MaybeCount.java | 10 +- .../internal/operators/maybe/MaybeCreate.java | 14 +-- .../internal/operators/maybe/MaybeDefer.java | 12 +-- .../internal/operators/maybe/MaybeDelay.java | 8 +- .../maybe/MaybeDelayOtherPublisher.java | 12 +-- .../MaybeDelaySubscriptionOtherPublisher.java | 12 +-- .../maybe/MaybeDelayWithCompletable.java | 15 ++- .../internal/operators/maybe/MaybeDetach.java | 8 +- .../operators/maybe/MaybeDoAfterSuccess.java | 16 +-- .../operators/maybe/MaybeDoFinally.java | 14 +-- .../operators/maybe/MaybeDoOnEvent.java | 12 +-- .../operators/maybe/MaybeDoOnTerminate.java | 15 ++- .../internal/operators/maybe/MaybeEmpty.java | 8 +- .../operators/maybe/MaybeEqualSingle.java | 14 +-- .../internal/operators/maybe/MaybeError.java | 6 +- .../operators/maybe/MaybeErrorCallable.java | 12 +-- .../internal/operators/maybe/MaybeFilter.java | 12 +-- .../operators/maybe/MaybeFilterSingle.java | 12 +-- .../maybe/MaybeFlatMapBiSelector.java | 14 +-- .../maybe/MaybeFlatMapCompletable.java | 14 +-- .../maybe/MaybeFlatMapIterableFlowable.java | 20 ++-- .../maybe/MaybeFlatMapIterableObservable.java | 18 ++-- .../maybe/MaybeFlatMapNotification.java | 14 +-- .../operators/maybe/MaybeFlatMapSingle.java | 21 ++-- .../maybe/MaybeFlatMapSingleElement.java | 14 +-- .../operators/maybe/MaybeFlatten.java | 14 +-- .../operators/maybe/MaybeFromAction.java | 12 +-- .../operators/maybe/MaybeFromCallable.java | 12 +-- .../operators/maybe/MaybeFromCompletable.java | 10 +- .../operators/maybe/MaybeFromFuture.java | 8 +- .../operators/maybe/MaybeFromRunnable.java | 12 +-- .../operators/maybe/MaybeFromSingle.java | 10 +- .../operators/maybe/MaybeFromSupplier.java | 12 +-- .../internal/operators/maybe/MaybeHide.java | 8 +- .../operators/maybe/MaybeIgnoreElement.java | 8 +- .../maybe/MaybeIgnoreElementCompletable.java | 12 +-- .../operators/maybe/MaybeIsEmpty.java | 8 +- .../operators/maybe/MaybeIsEmptySingle.java | 12 +-- .../internal/operators/maybe/MaybeJust.java | 8 +- .../internal/operators/maybe/MaybeLift.java | 10 +- .../internal/operators/maybe/MaybeMap.java | 16 +-- .../operators/maybe/MaybeMaterialize.java | 6 +- .../operators/maybe/MaybeMergeArray.java | 18 ++-- .../internal/operators/maybe/MaybeNever.java | 6 +- .../operators/maybe/MaybeObserveOn.java | 8 +- .../operators/maybe/MaybeOnErrorComplete.java | 12 +-- .../operators/maybe/MaybeOnErrorNext.java | 14 +-- .../operators/maybe/MaybeOnErrorReturn.java | 16 +-- .../internal/operators/maybe/MaybePeek.java | 16 +-- .../operators/maybe/MaybeSubscribeOn.java | 8 +- .../operators/maybe/MaybeSwitchIfEmpty.java | 8 +- .../maybe/MaybeSwitchIfEmptySingle.java | 12 +-- .../operators/maybe/MaybeTakeUntilMaybe.java | 10 +- .../maybe/MaybeTakeUntilPublisher.java | 12 +-- .../operators/maybe/MaybeTimeoutMaybe.java | 10 +- .../maybe/MaybeTimeoutPublisher.java | 12 +-- .../internal/operators/maybe/MaybeTimer.java | 8 +- .../operators/maybe/MaybeToFlowable.java | 12 +-- .../operators/maybe/MaybeToObservable.java | 12 +-- .../operators/maybe/MaybeToPublisher.java | 6 +- .../operators/maybe/MaybeToSingle.java | 10 +- .../operators/maybe/MaybeUnsafeCreate.java | 4 +- .../operators/maybe/MaybeUnsubscribeOn.java | 8 +- .../internal/operators/maybe/MaybeUsing.java | 16 +-- .../operators/maybe/MaybeZipArray.java | 16 +-- .../operators/maybe/MaybeZipIterable.java | 14 +-- .../mixed/CompletableAndThenObservable.java | 8 +- .../mixed/CompletableAndThenPublisher.java | 10 +- .../mixed/FlowableConcatMapCompletable.java | 24 ++--- .../mixed/FlowableConcatMapMaybe.java | 24 ++--- .../mixed/FlowableConcatMapSingle.java | 24 ++--- .../mixed/FlowableSwitchMapCompletable.java | 20 ++-- .../mixed/FlowableSwitchMapMaybe.java | 20 ++-- .../mixed/FlowableSwitchMapSingle.java | 20 ++-- .../mixed/MaterializeSingleObserver.java | 8 +- .../mixed/MaybeFlatMapObservable.java | 16 +-- .../mixed/MaybeFlatMapPublisher.java | 16 +-- .../mixed/ObservableConcatMapCompletable.java | 22 ++-- .../mixed/ObservableConcatMapMaybe.java | 22 ++-- .../mixed/ObservableConcatMapSingle.java | 22 ++-- .../mixed/ObservableSwitchMapCompletable.java | 18 ++-- .../mixed/ObservableSwitchMapMaybe.java | 18 ++-- .../mixed/ObservableSwitchMapSingle.java | 18 ++-- .../operators/mixed/ScalarXMapZHelper.java | 16 +-- .../mixed/SingleFlatMapObservable.java | 16 +-- .../AbstractObservableWithUpstream.java | 6 +- .../BlockingObservableIterable.java | 14 +-- .../observable/BlockingObservableLatest.java | 12 +-- .../BlockingObservableMostRecent.java | 18 ++-- .../observable/BlockingObservableNext.java | 10 +- .../operators/observable/ObservableAll.java | 14 +-- .../observable/ObservableAllSingle.java | 16 +-- .../operators/observable/ObservableAmb.java | 12 +-- .../operators/observable/ObservableAny.java | 14 +-- .../observable/ObservableAnySingle.java | 18 ++-- .../observable/ObservableAutoConnect.java | 10 +- .../ObservableBlockingSubscribe.java | 12 +-- .../observable/ObservableBuffer.java | 16 +-- .../observable/ObservableBufferBoundary.java | 22 ++-- .../ObservableBufferExactBoundary.java | 22 ++-- .../observable/ObservableBufferTimed.java | 28 ++--- .../operators/observable/ObservableCache.java | 6 +- .../observable/ObservableCollect.java | 16 +-- .../observable/ObservableCollectSingle.java | 18 ++-- .../observable/ObservableCombineLatest.java | 20 ++-- .../observable/ObservableConcatMap.java | 24 ++--- .../observable/ObservableConcatMapEager.java | 24 ++--- .../ObservableConcatMapScheduler.java | 24 ++--- .../ObservableConcatWithCompletable.java | 8 +- .../observable/ObservableConcatWithMaybe.java | 8 +- .../ObservableConcatWithSingle.java | 8 +- .../operators/observable/ObservableCount.java | 8 +- .../observable/ObservableCountSingle.java | 12 +-- .../observable/ObservableCreate.java | 20 ++-- .../observable/ObservableDebounce.java | 18 ++-- .../observable/ObservableDebounceTimed.java | 14 +-- .../operators/observable/ObservableDefer.java | 12 +-- .../operators/observable/ObservableDelay.java | 12 +-- .../ObservableDelaySubscriptionOther.java | 10 +- .../observable/ObservableDematerialize.java | 18 ++-- .../observable/ObservableDetach.java | 10 +- .../observable/ObservableDistinct.java | 18 ++-- .../ObservableDistinctUntilChanged.java | 10 +- .../observable/ObservableDoAfterNext.java | 10 +- .../observable/ObservableDoFinally.java | 22 ++-- .../observable/ObservableDoOnEach.java | 16 +-- .../observable/ObservableDoOnLifecycle.java | 10 +- .../observable/ObservableElementAt.java | 10 +- .../observable/ObservableElementAtMaybe.java | 12 +-- .../observable/ObservableElementAtSingle.java | 14 +-- .../operators/observable/ObservableEmpty.java | 9 +- .../operators/observable/ObservableError.java | 12 +-- .../observable/ObservableFilter.java | 10 +- .../observable/ObservableFlatMap.java | 24 ++--- .../ObservableFlatMapCompletable.java | 22 ++-- ...servableFlatMapCompletableCompletable.java | 20 ++-- .../observable/ObservableFlatMapMaybe.java | 20 ++-- .../observable/ObservableFlatMapSingle.java | 20 ++-- .../observable/ObservableFlattenIterable.java | 16 +-- .../observable/ObservableFromArray.java | 10 +- .../observable/ObservableFromCallable.java | 14 +-- .../observable/ObservableFromFuture.java | 10 +- .../observable/ObservableFromIterable.java | 14 +-- .../observable/ObservableFromPublisher.java | 8 +- .../observable/ObservableFromSupplier.java | 14 +-- .../ObservableFromUnsafeSource.java | 4 +- .../observable/ObservableGenerate.java | 16 +-- .../observable/ObservableGroupBy.java | 20 ++-- .../observable/ObservableGroupJoin.java | 26 ++--- .../operators/observable/ObservableHide.java | 8 +- .../observable/ObservableIgnoreElements.java | 6 +- .../ObservableIgnoreElementsCompletable.java | 10 +- .../observable/ObservableInternalHelper.java | 12 +-- .../observable/ObservableInterval.java | 12 +-- .../observable/ObservableIntervalRange.java | 12 +-- .../operators/observable/ObservableJoin.java | 22 ++-- .../operators/observable/ObservableJust.java | 8 +- .../observable/ObservableLastMaybe.java | 8 +- .../observable/ObservableLastSingle.java | 8 +- .../operators/observable/ObservableLift.java | 10 +- .../operators/observable/ObservableMap.java | 12 +-- .../observable/ObservableMapNotification.java | 16 +-- .../observable/ObservableMaterialize.java | 8 +- .../ObservableMergeWithCompletable.java | 10 +- .../observable/ObservableMergeWithMaybe.java | 16 +-- .../observable/ObservableMergeWithSingle.java | 16 +-- .../operators/observable/ObservableNever.java | 7 +- .../observable/ObservableObserveOn.java | 24 ++--- .../observable/ObservableOnErrorNext.java | 16 +-- .../observable/ObservableOnErrorReturn.java | 12 +-- .../observable/ObservablePublish.java | 20 ++-- .../observable/ObservablePublishSelector.java | 16 +-- .../operators/observable/ObservableRange.java | 8 +- .../observable/ObservableRangeLong.java | 8 +- .../observable/ObservableReduceMaybe.java | 18 ++-- .../ObservableReduceSeedSingle.java | 18 ++-- .../ObservableReduceWithSingle.java | 16 +-- .../observable/ObservableRefCount.java | 14 +-- .../observable/ObservableRepeat.java | 8 +- .../observable/ObservableRepeatUntil.java | 12 +-- .../observable/ObservableRepeatWhen.java | 18 ++-- .../observable/ObservableReplay.java | 28 ++--- .../ObservableRetryBiPredicate.java | 12 +-- .../observable/ObservableRetryPredicate.java | 12 +-- .../observable/ObservableRetryWhen.java | 18 ++-- .../observable/ObservableSampleTimed.java | 10 +- .../ObservableSampleWithObservable.java | 10 +- .../observable/ObservableScalarXMap.java | 18 ++-- .../operators/observable/ObservableScan.java | 18 ++-- .../observable/ObservableScanSeed.java | 18 ++-- .../observable/ObservableSequenceEqual.java | 14 +-- .../ObservableSequenceEqualSingle.java | 18 ++-- .../observable/ObservableSerialized.java | 7 +- .../observable/ObservableSingleMaybe.java | 10 +- .../observable/ObservableSingleSingle.java | 11 +- .../operators/observable/ObservableSkip.java | 8 +- .../observable/ObservableSkipLast.java | 8 +- .../observable/ObservableSkipLastTimed.java | 10 +- .../observable/ObservableSkipUntil.java | 10 +- .../observable/ObservableSkipWhile.java | 12 +-- .../observable/ObservableSubscribeOn.java | 8 +- .../observable/ObservableSwitchIfEmpty.java | 8 +- .../observable/ObservableSwitchMap.java | 22 ++-- .../operators/observable/ObservableTake.java | 10 +- .../observable/ObservableTakeLast.java | 8 +- .../observable/ObservableTakeLastOne.java | 8 +- .../observable/ObservableTakeLastTimed.java | 10 +- .../observable/ObservableTakeUntil.java | 10 +- .../ObservableTakeUntilPredicate.java | 14 +-- .../observable/ObservableTakeWhile.java | 16 +-- .../ObservableThrottleFirstTimed.java | 14 +-- .../observable/ObservableThrottleLatest.java | 8 +- .../observable/ObservableTimeInterval.java | 10 +- .../observable/ObservableTimeout.java | 18 ++-- .../observable/ObservableTimeoutTimed.java | 14 +-- .../operators/observable/ObservableTimer.java | 8 +- .../observable/ObservableToList.java | 14 +-- .../observable/ObservableToListSingle.java | 18 ++-- .../observable/ObservableUnsubscribeOn.java | 10 +- .../operators/observable/ObservableUsing.java | 16 +-- .../observable/ObservableWindow.java | 10 +- .../observable/ObservableWindowBoundary.java | 18 ++-- .../ObservableWindowBoundarySelector.java | 30 +++--- .../observable/ObservableWindowTimed.java | 24 ++--- .../observable/ObservableWithLatestFrom.java | 16 +-- .../ObservableWithLatestFromMany.java | 21 ++-- .../operators/observable/ObservableZip.java | 16 +-- .../observable/ObservableZipIterable.java | 16 +-- .../observable/ObserverResourceWrapper.java | 8 +- .../operators/parallel/ParallelCollect.java | 16 +-- .../operators/parallel/ParallelConcatMap.java | 12 +-- .../parallel/ParallelDoOnNextTry.java | 16 +-- .../operators/parallel/ParallelFilter.java | 14 +-- .../operators/parallel/ParallelFilterTry.java | 16 +-- .../operators/parallel/ParallelFlatMap.java | 8 +- .../operators/parallel/ParallelFromArray.java | 4 +- .../parallel/ParallelFromPublisher.java | 16 +-- .../operators/parallel/ParallelJoin.java | 18 ++-- .../operators/parallel/ParallelMap.java | 18 ++-- .../operators/parallel/ParallelMapTry.java | 16 +-- .../operators/parallel/ParallelPeek.java | 16 +-- .../operators/parallel/ParallelReduce.java | 16 +-- .../parallel/ParallelReduceFull.java | 16 +-- .../operators/parallel/ParallelRunOn.java | 24 ++--- .../parallel/ParallelSortedJoin.java | 14 +-- .../internal/operators/single/SingleAmb.java | 12 +-- .../operators/single/SingleCache.java | 6 +- .../operators/single/SingleContains.java | 10 +- .../operators/single/SingleCreate.java | 14 +-- .../operators/single/SingleDefer.java | 12 +-- .../operators/single/SingleDelay.java | 8 +- .../single/SingleDelayWithCompletable.java | 10 +- .../single/SingleDelayWithObservable.java | 12 +-- .../single/SingleDelayWithPublisher.java | 14 +-- .../single/SingleDelayWithSingle.java | 10 +- .../operators/single/SingleDematerialize.java | 16 +-- .../operators/single/SingleDetach.java | 8 +- .../single/SingleDoAfterSuccess.java | 16 +-- .../single/SingleDoAfterTerminate.java | 18 ++-- .../operators/single/SingleDoFinally.java | 14 +-- .../operators/single/SingleDoOnDispose.java | 14 +-- .../operators/single/SingleDoOnError.java | 10 +- .../operators/single/SingleDoOnEvent.java | 13 +-- .../operators/single/SingleDoOnSubscribe.java | 16 +-- .../operators/single/SingleDoOnSuccess.java | 10 +- .../operators/single/SingleDoOnTerminate.java | 13 +-- .../operators/single/SingleEquals.java | 10 +- .../operators/single/SingleError.java | 12 +-- .../operators/single/SingleFlatMap.java | 17 +-- .../single/SingleFlatMapCompletable.java | 14 +-- .../single/SingleFlatMapIterableFlowable.java | 20 ++-- .../SingleFlatMapIterableObservable.java | 18 ++-- .../operators/single/SingleFlatMapMaybe.java | 21 ++-- .../single/SingleFlatMapPublisher.java | 31 +++--- .../operators/single/SingleFromCallable.java | 13 ++- .../operators/single/SingleFromPublisher.java | 10 +- .../operators/single/SingleFromSupplier.java | 16 +-- .../single/SingleFromUnsafeSource.java | 4 +- .../internal/operators/single/SingleHide.java | 8 +- .../single/SingleInternalHelper.java | 8 +- .../internal/operators/single/SingleJust.java | 6 +- .../internal/operators/single/SingleLift.java | 10 +- .../internal/operators/single/SingleMap.java | 12 +-- .../operators/single/SingleMaterialize.java | 6 +- .../operators/single/SingleNever.java | 6 +- .../operators/single/SingleObserveOn.java | 8 +- .../operators/single/SingleOnErrorReturn.java | 10 +- .../operators/single/SingleResumeNext.java | 16 +-- .../operators/single/SingleSubscribeOn.java | 8 +- .../operators/single/SingleTakeUntil.java | 12 +-- .../operators/single/SingleTimeout.java | 14 +-- .../operators/single/SingleTimer.java | 8 +- .../operators/single/SingleToFlowable.java | 10 +- .../operators/single/SingleToObservable.java | 10 +- .../operators/single/SingleUnsubscribeOn.java | 8 +- .../operators/single/SingleUsing.java | 16 +-- .../operators/single/SingleZipArray.java | 16 +-- .../operators/single/SingleZipIterable.java | 14 +-- .../internal/queue/MpscLinkedQueue.java | 6 +- .../internal/queue/SpscArrayQueue.java | 8 +- .../internal/queue/SpscLinkedArrayQueue.java | 8 +- .../schedulers/AbstractDirectTask.java | 8 +- .../schedulers/ComputationScheduler.java | 12 +-- .../internal/schedulers/DisposeOnCancel.java | 4 +- .../schedulers/ExecutorScheduler.java | 20 ++-- .../schedulers/ImmediateThinScheduler.java | 8 +- .../schedulers/InstantPeriodicTask.java | 8 +- .../internal/schedulers/IoScheduler.java | 12 +-- .../schedulers/NewThreadScheduler.java | 8 +- .../internal/schedulers/NewThreadWorker.java | 13 ++- .../schedulers/NonBlockingThread.java | 2 +- .../internal/schedulers/RxThreadFactory.java | 2 +- .../ScheduledDirectPeriodicTask.java | 4 +- .../schedulers/ScheduledDirectTask.java | 2 +- .../schedulers/ScheduledRunnable.java | 8 +- .../SchedulerMultiWorkerSupport.java | 12 +-- .../schedulers/SchedulerPoolFactory.java | 2 +- .../internal/schedulers/SchedulerWhen.java | 33 +++--- .../internal/schedulers/SingleScheduler.java | 14 +-- .../schedulers/TrampolineScheduler.java | 14 +-- .../BasicFuseableConditionalSubscriber.java | 10 +- .../subscribers/BasicFuseableSubscriber.java | 12 +-- .../subscribers/BlockingBaseSubscriber.java | 8 +- .../subscribers/BlockingFirstSubscriber.java | 4 +- .../subscribers/BlockingLastSubscriber.java | 2 +- .../subscribers/BlockingSubscriber.java | 8 +- .../subscribers/BoundedSubscriber.java | 25 +++-- .../subscribers/DeferredScalarSubscriber.java | 6 +- .../subscribers/ForEachWhileSubscriber.java | 14 +-- .../subscribers/FutureSubscriber.java | 14 +-- .../subscribers/InnerQueuedSubscriber.java | 10 +- .../InnerQueuedSubscriberSupport.java | 2 +- .../subscribers/LambdaSubscriber.java | 18 ++-- .../subscribers/QueueDrainSubscriber.java | 14 +-- .../SinglePostCompleteSubscriber.java | 8 +- .../subscribers/StrictSubscriber.java | 8 +- .../SubscriberResourceWrapper.java | 10 +- .../ArrayCompositeSubscription.java | 4 +- .../subscriptions/AsyncSubscription.java | 6 +- .../BasicIntQueueSubscription.java | 4 +- .../subscriptions/BasicQueueSubscription.java | 4 +- .../subscriptions/BooleanSubscription.java | 2 +- .../DeferredScalarSubscription.java | 5 +- .../subscriptions/EmptySubscription.java | 6 +- .../subscriptions/ScalarSubscription.java | 6 +- .../subscriptions/SubscriptionArbiter.java | 6 +- .../subscriptions/SubscriptionHelper.java | 10 +- .../util/AppendOnlyLinkedArrayList.java | 6 +- .../internal/util/ArrayListSupplier.java | 4 +- .../internal/util/AtomicThrowable.java | 6 +- .../internal/util/BackpressureHelper.java | 4 +- .../internal/util/BlockingHelper.java | 8 +- .../util/BlockingIgnoringReceiver.java | 4 +- .../internal/util/ConnectConsumer.java | 6 +- .../internal/util/EmptyComponent.java | 8 +- .../internal/util/EndConsumerHelper.java | 16 +-- .../internal/util/ErrorMode.java | 2 +- .../internal/util/ExceptionHelper.java | 4 +- .../internal/util/HalfSerializer.java | 6 +- .../internal/util/HashMapSupplier.java | 4 +- .../internal/util/LinkedArrayList.java | 2 +- .../internal/util/ListAddBiConsumer.java | 4 +- .../internal/util/MergerBiFunction.java | 4 +- .../internal/util/NotificationLite.java | 8 +- .../internal/util/ObservableQueueDrain.java | 4 +- .../internal/util/OpenHashSet.java | 2 +- .../{ => rxjava3}/internal/util/Pow2.java | 2 +- .../internal/util/QueueDrain.java | 2 +- .../internal/util/QueueDrainHelper.java | 14 +-- .../internal/util/SorterFunction.java | 4 +- .../internal/util/SuppressAnimalSniffer.java | 2 +- .../internal/util/VolatileSizeArrayList.java | 2 +- .../observables/ConnectableObservable.java | 20 ++-- .../observables/GroupedObservable.java | 8 +- .../observables/package-info.java | 6 +- .../observers/BaseTestConsumer.java | 10 +- .../observers/DefaultObserver.java | 16 +-- .../DisposableCompletableObserver.java | 12 +-- .../observers/DisposableMaybeObserver.java | 14 +-- .../observers/DisposableObserver.java | 14 +-- .../observers/DisposableSingleObserver.java | 12 +-- .../LambdaConsumerIntrospection.java | 2 +- .../ResourceCompletableObserver.java | 18 ++-- .../observers/ResourceMaybeObserver.java | 20 ++-- .../observers/ResourceObserver.java | 20 ++-- .../observers/ResourceSingleObserver.java | 18 ++-- .../{ => rxjava3}/observers/SafeObserver.java | 16 +-- .../observers/SerializedObserver.java | 16 +-- .../{ => rxjava3}/observers/TestObserver.java | 8 +- .../{ => rxjava3}/observers/package-info.java | 8 +- .../parallel/ParallelFailureHandling.java | 4 +- .../parallel/ParallelFlowable.java | 18 ++-- .../parallel/ParallelFlowableConverter.java | 4 +- .../parallel/ParallelTransformer.java | 4 +- .../rxjava3/parallel/package-info.java | 21 ++++ .../{ => rxjava3}/plugins/RxJavaPlugins.java | 26 ++--- .../{ => rxjava3}/plugins/package-info.java | 4 +- .../processors/AsyncProcessor.java | 18 ++-- .../processors/BehaviorProcessor.java | 20 ++-- .../processors/FlowableProcessor.java | 6 +- .../processors/MulticastProcessor.java | 24 ++--- .../processors/PublishProcessor.java | 20 ++-- .../processors/ReplayProcessor.java | 18 ++-- .../processors/SerializedProcessor.java | 8 +- .../processors/UnicastProcessor.java | 24 ++--- .../processors/package-info.java | 20 ++-- .../SchedulerRunnableIntrospection.java | 12 +-- .../{ => rxjava3}/schedulers/Schedulers.java | 66 ++++++------ .../schedulers/TestScheduler.java | 12 +-- .../{ => rxjava3}/schedulers/Timed.java | 6 +- .../schedulers/package-info.java | 8 +- .../{ => rxjava3}/subjects/AsyncSubject.java | 22 ++-- .../subjects/BehaviorSubject.java | 24 ++--- .../subjects/CompletableSubject.java | 20 ++-- .../{ => rxjava3}/subjects/MaybeSubject.java | 20 ++-- .../subjects/PublishSubject.java | 22 ++-- .../{ => rxjava3}/subjects/ReplaySubject.java | 24 ++--- .../subjects/SerializedSubject.java | 14 +-- .../{ => rxjava3}/subjects/SingleSubject.java | 20 ++-- .../{ => rxjava3}/subjects/Subject.java | 8 +- .../subjects/UnicastSubject.java | 29 +++-- .../{ => rxjava3}/subjects/package-info.java | 38 +++---- .../subscribers/DefaultSubscriber.java | 10 +- .../subscribers/DisposableSubscriber.java | 12 +-- .../subscribers/ResourceSubscriber.java | 20 ++-- .../subscribers/SafeSubscriber.java | 10 +- .../subscribers/SerializedSubscriber.java | 10 +- .../subscribers/TestSubscriber.java | 8 +- .../subscribers/package-info.java | 6 +- .../CapturingUncaughtExceptionHandler.java | 2 +- .../completable/CompletableRetryTest.java | 14 +-- .../completable/CompletableTest.java | 37 +++---- .../completable/CompletableTimerTest.java | 13 ++- .../core}/BackpressureEnumTest.java | 4 +- .../{ => rxjava3/core}/ConverterTest.java | 6 +- .../{ => rxjava3/core}/NotificationTest.java | 6 +- .../reactivex/{ => rxjava3/core}/Retry.java | 2 +- .../{ => rxjava3/core}/RxJavaTest.java | 10 +- .../{ => rxjava3/core}/TransformerTest.java | 7 +- .../{ => rxjava3/core}/XFlatMapTest.java | 16 +-- .../disposables/CompositeDisposableTest.java | 10 +- .../disposables/DisposablesTest.java | 13 +-- .../disposables/FutureDisposableTest.java | 10 +- .../disposables/SequentialDisposableTest.java | 6 +- .../disposables/SerialDisposableTests.java | 6 +- .../exceptions/CompositeExceptionTest.java | 6 +- .../exceptions/ExceptionsTest.java | 18 ++-- .../OnErrorNotImplementedExceptionTest.java | 10 +- .../exceptions/TestException.java | 2 +- .../{ => rxjava3}/flowable/Burst.java | 15 ++- .../flowable/FlowableBackpressureTests.java | 17 ++- .../flowable/FlowableCollectTest.java | 16 +-- .../flowable/FlowableCombineLatestTests.java | 11 +- .../flowable/FlowableConcatTests.java | 7 +- .../flowable/FlowableConversionTest.java | 16 +-- .../flowable/FlowableCovarianceTest.java | 10 +- .../flowable/FlowableDoAfterNextTest.java | 6 +- .../flowable/FlowableDoOnTest.java | 8 +- .../flowable/FlowableErrorHandlingTests.java | 9 +- .../flowable/FlowableEventStream.java | 8 +- .../flowable/FlowableEventStreamTest.java | 6 +- .../flowable/FlowableFuseableTest.java | 9 +- .../flowable/FlowableGroupByTests.java | 13 ++- .../flowable/FlowableMergeTests.java | 9 +- .../flowable/FlowableNotificationTest.java | 4 +- .../flowable/FlowableNullTests.java | 18 ++-- .../flowable/FlowableReduceTests.java | 8 +- .../flowable/FlowableStartWithTests.java | 5 +- .../flowable/FlowableSubscriberTest.java | 26 ++--- .../{ => rxjava3}/flowable/FlowableTests.java | 29 ++--- .../flowable/FlowableThrottleLastTests.java | 10 +- .../FlowableThrottleWithTimeoutTests.java | 10 +- .../flowable/FlowableWindowTests.java | 7 +- .../flowable/FlowableZipTests.java | 13 ++- .../internal/SubscribeWithTest.java | 13 +-- .../ArrayCompositeDisposableTest.java | 8 +- .../CancellableDisposableTest.java | 12 +-- .../disposables/DisposableHelperTest.java | 10 +- .../disposables/EmptyDisposableTest.java | 8 +- .../ListCompositeDisposableTest.java | 10 +- .../internal/functions/FunctionsTest.java | 16 +-- .../internal/functions/ObjectHelperTest.java | 10 +- .../observers/BasicFuseableObserverTest.java | 12 +-- .../observers/BasicQueueDisposableTest.java | 7 +- .../observers/BlockingFirstObserverTest.java | 8 +- .../observers/BlockingMultiObserverTest.java | 8 +- .../observers/BlockingObserverTest.java | 5 +- .../CallbackCompletableObserverTest.java | 9 +- .../observers/ConsumerSingleObserverTest.java | 9 +- .../observers/DeferredScalarObserverTest.java | 17 ++- .../DisposableLambdaObserverTest.java | 18 ++-- .../EmptyCompletableObserverTest.java | 7 +- .../observers/FutureObserverTest.java | 22 ++-- .../observers/FutureSingleObserverTest.java | 18 ++-- .../observers/LambdaObserverTest.java | 22 ++-- .../observers/QueueDrainObserverTest.java | 12 +-- .../completable/CompletableAmbTest.java | 26 ++--- .../CompletableAndThenCompletableabTest.java | 18 ++-- .../completable/CompletableAndThenTest.java | 6 +- .../completable/CompletableAwaitTest.java | 6 +- .../completable/CompletableCacheTest.java | 18 ++-- .../completable/CompletableConcatTest.java | 22 ++-- .../completable/CompletableCreateTest.java | 14 +-- .../CompletableDelaySubscriptionTest.java | 15 ++- .../completable/CompletableDelayTest.java | 15 ++- .../completable/CompletableDetachTest.java | 16 +-- .../completable/CompletableDisposeOnTest.java | 18 ++-- .../completable/CompletableDoFinallyTest.java | 14 +-- .../completable/CompletableDoOnTest.java | 14 +-- .../CompletableFromActionTest.java | 9 +- .../CompletableFromCallableTest.java | 15 +-- .../completable/CompletableFromMaybeTest.java | 7 +- .../CompletableFromObservableTest.java | 7 +- .../CompletableFromPublisherTest.java | 8 +- .../CompletableFromRunnableTest.java | 7 +- .../CompletableFromSingleTest.java | 7 +- .../CompletableFromSupplierTest.java | 17 +-- .../completable/CompletableHideTest.java | 16 +-- .../completable/CompletableLiftTest.java | 10 +- .../CompletableMaterializeTest.java | 12 +-- .../CompletableMergeIterableTest.java | 14 +-- .../completable/CompletableMergeTest.java | 20 ++-- .../completable/CompletableObserveOnTest.java | 10 +- .../completable/CompletableOnErrorXTest.java | 9 +- .../completable/CompletablePeekTest.java | 16 +-- .../CompletableRepeatWhenTest.java | 9 +- .../CompletableResumeNextTest.java | 12 +-- .../CompletableSubscribeOnTest.java | 16 +-- .../completable/CompletableSubscribeTest.java | 8 +- .../completable/CompletableTakeUntilTest.java | 16 +-- .../completable/CompletableTimeoutTest.java | 25 +++-- .../completable/CompletableTimerTest.java | 12 +-- .../CompletableToFlowableTest.java | 8 +- .../CompletableToObservableTest.java | 16 +-- .../completable/CompletableUnsafeTest.java | 10 +- .../completable/CompletableUsingTest.java | 20 ++-- .../AbstractFlowableWithUpstreamTest.java | 9 +- .../flowable/BlockingFlowableLatestTest.java | 14 +-- .../BlockingFlowableMostRecentTest.java | 10 +- .../flowable/BlockingFlowableNextTest.java | 20 ++-- .../BlockingFlowableToFutureTest.java | 10 +- .../BlockingFlowableToIteratorTest.java | 13 ++- .../flowable/BufferUntilSubscriberTest.java | 11 +- .../operators/flowable/FlowableAllTest.java | 23 ++-- .../operators/flowable/FlowableAmbTest.java | 24 ++--- .../operators/flowable/FlowableAnyTest.java | 21 ++-- .../flowable/FlowableAsObservableTest.java | 11 +- .../flowable/FlowableAutoConnectTest.java | 6 +- .../flowable/FlowableBlockingTest.java | 22 ++-- .../flowable/FlowableBufferTest.java | 26 ++--- .../operators/flowable/FlowableCacheTest.java | 21 ++-- .../operators/flowable/FlowableCastTest.java | 11 +- .../flowable/FlowableCombineLatestTest.java | 29 ++--- .../FlowableConcatDelayErrorTest.java | 15 ++- .../flowable/FlowableConcatMapEagerTest.java | 22 ++-- .../FlowableConcatMapSchedulerTest.java | 26 ++--- .../flowable/FlowableConcatMapTest.java | 16 +-- .../flowable/FlowableConcatTest.java | 27 ++--- .../FlowableConcatWithCompletableTest.java | 18 ++-- .../flowable/FlowableConcatWithMaybeTest.java | 12 +-- .../FlowableConcatWithSingleTest.java | 10 +- .../operators/flowable/FlowableCountTest.java | 8 +- .../flowable/FlowableCreateTest.java | 16 +-- .../flowable/FlowableDebounceTest.java | 27 ++--- .../flowable/FlowableDefaultIfEmptyTest.java | 10 +- .../operators/flowable/FlowableDeferTest.java | 11 +- .../FlowableDelaySubscriptionOtherTest.java | 16 +-- .../operators/flowable/FlowableDelayTest.java | 19 ++-- .../flowable/FlowableDematerializeTest.java | 17 +-- .../flowable/FlowableDetachTest.java | 12 +-- .../flowable/FlowableDistinctTest.java | 21 ++-- .../FlowableDistinctUntilChangedTest.java | 24 ++--- .../flowable/FlowableDoAfterNextTest.java | 19 ++-- .../FlowableDoAfterTerminateTest.java | 14 +-- .../flowable/FlowableDoFinallyTest.java | 18 ++-- .../flowable/FlowableDoOnEachTest.java | 25 ++--- .../flowable/FlowableDoOnLifecycleTest.java | 16 +-- .../flowable/FlowableDoOnRequestTest.java | 11 +- .../flowable/FlowableDoOnSubscribeTest.java | 9 +- .../flowable/FlowableDoOnUnsubscribeTest.java | 13 ++- .../flowable/FlowableElementAtTest.java | 29 +++-- .../flowable/FlowableFilterTest.java | 24 ++--- .../operators/flowable/FlowableFirstTest.java | 13 +-- .../FlowableFlatMapCompletableTest.java | 24 ++--- .../flowable/FlowableFlatMapMaybeTest.java | 27 +++-- .../flowable/FlowableFlatMapSingleTest.java | 27 +++-- .../flowable/FlowableFlatMapTest.java | 21 ++-- .../flowable/FlowableFlattenIterableTest.java | 26 ++--- .../flowable/FlowableForEachTest.java | 9 +- .../flowable/FlowableFromArrayTest.java | 14 +-- .../flowable/FlowableFromCallableTest.java | 17 +-- .../flowable/FlowableFromIterableTest.java | 23 ++-- .../flowable/FlowableFromObservableTest.java | 8 +- .../flowable/FlowableFromSourceTest.java | 16 +-- .../flowable/FlowableFromSupplierTest.java | 18 ++-- .../flowable/FlowableGenerateTest.java | 16 +-- .../flowable/FlowableGroupByTest.java | 27 ++--- .../flowable/FlowableGroupJoinTest.java | 21 ++-- .../operators/flowable/FlowableHideTest.java | 13 +-- .../flowable/FlowableIgnoreElementsTest.java | 18 ++-- .../flowable/FlowableInternalHelperTest.java | 6 +- .../flowable/FlowableIntervalRangeTest.java | 10 +- .../flowable/FlowableIntervalTest.java | 12 +-- .../operators/flowable/FlowableJoinTest.java | 22 ++-- .../operators/flowable/FlowableLastTest.java | 11 +- .../operators/flowable/FlowableLiftTest.java | 10 +- .../operators/flowable/FlowableLimitTest.java | 18 ++-- .../flowable/FlowableMapNotificationTest.java | 21 ++-- .../operators/flowable/FlowableMapTest.java | 26 ++--- .../flowable/FlowableMaterializeTest.java | 14 +-- .../flowable/FlowableMergeDelayErrorTest.java | 18 ++-- .../FlowableMergeMaxConcurrentTest.java | 15 ++- .../operators/flowable/FlowableMergeTest.java | 27 ++--- .../FlowableMergeWithCompletableTest.java | 16 +-- .../flowable/FlowableMergeWithMaybeTest.java | 20 ++-- .../flowable/FlowableMergeWithSingleTest.java | 20 ++-- .../flowable/FlowableObserveOnTest.java | 33 +++--- ...wableOnBackpressureBufferStrategyTest.java | 20 ++-- .../FlowableOnBackpressureBufferTest.java | 19 ++-- .../FlowableOnBackpressureDropTest.java | 15 ++- .../FlowableOnBackpressureErrorTest.java | 8 +- .../FlowableOnBackpressureLatestTest.java | 17 ++- ...wableOnErrorResumeNextViaFlowableTest.java | 20 ++-- ...wableOnErrorResumeNextViaFunctionTest.java | 23 ++-- .../flowable/FlowableOnErrorReturnTest.java | 20 ++-- .../flowable/FlowablePublishFunctionTest.java | 21 ++-- .../FlowablePublishMulticastTest.java | 18 ++-- .../flowable/FlowablePublishTest.java | 34 +++--- .../flowable/FlowableRangeLongTest.java | 16 +-- .../operators/flowable/FlowableRangeTest.java | 16 +-- .../flowable/FlowableReduceTest.java | 23 ++-- .../FlowableReduceWithSingleTest.java | 10 +- .../flowable/FlowableRefCountTest.java | 30 +++--- .../flowable/FlowableRepeatTest.java | 23 ++-- .../FlowableReplayEagerTruncateTest.java | 35 +++--- .../flowable/FlowableReplayTest.java | 35 +++--- .../operators/flowable/FlowableRetryTest.java | 28 ++--- .../FlowableRetryWithPredicateTest.java | 24 ++--- .../flowable/FlowableSampleTest.java | 19 ++-- .../flowable/FlowableScalarXMapTest.java | 14 +-- .../operators/flowable/FlowableScanTest.java | 21 ++-- .../flowable/FlowableSequenceEqualTest.java | 29 ++--- .../flowable/FlowableSerializeTest.java | 11 +- .../flowable/FlowableSingleTest.java | 15 +-- .../flowable/FlowableSkipLastTest.java | 18 ++-- .../flowable/FlowableSkipLastTimedTest.java | 17 +-- .../operators/flowable/FlowableSkipTest.java | 12 +-- .../flowable/FlowableSkipTimedTest.java | 13 +-- .../flowable/FlowableSkipUntilTest.java | 11 +- .../flowable/FlowableSkipWhileTest.java | 15 +-- .../flowable/FlowableSubscribeOnTest.java | 24 ++--- .../flowable/FlowableSwitchIfEmptyTest.java | 14 ++- .../flowable/FlowableSwitchTest.java | 26 ++--- .../flowable/FlowableTakeLastOneTest.java | 13 ++- .../flowable/FlowableTakeLastTest.java | 18 ++-- .../flowable/FlowableTakeLastTimedTest.java | 17 +-- .../operators/flowable/FlowableTakeTest.java | 23 ++-- .../flowable/FlowableTakeTimedTest.java | 13 +-- .../FlowableTakeUntilPredicateTest.java | 22 ++-- .../flowable/FlowableTakeUntilTest.java | 15 ++- .../flowable/FlowableTakeWhileTest.java | 22 ++-- .../flowable/FlowableThrottleFirstTest.java | 17 +-- .../flowable/FlowableThrottleLatestTest.java | 20 ++-- .../flowable/FlowableTimeIntervalTest.java | 16 +-- .../flowable/FlowableTimeoutTests.java | 22 ++-- .../FlowableTimeoutWithSelectorTest.java | 26 ++--- .../operators/flowable/FlowableTimerTest.java | 19 ++-- .../flowable/FlowableTimestampTest.java | 15 +-- .../flowable/FlowableToCompletableTest.java | 10 +- .../flowable/FlowableToFutureTest.java | 11 +- .../flowable/FlowableToListTest.java | 17 +-- .../operators/flowable/FlowableToMapTest.java | 9 +- .../flowable/FlowableToMultimapTest.java | 9 +- .../flowable/FlowableToSingleTest.java | 8 +- .../flowable/FlowableToSortedListTest.java | 11 +- .../flowable/FlowableUnsubscribeOnTest.java | 18 ++-- .../operators/flowable/FlowableUsingTest.java | 21 ++-- .../FlowableWindowWithFlowableTest.java | 22 ++-- .../flowable/FlowableWindowWithSizeTest.java | 20 ++-- ...lowableWindowWithStartEndFlowableTest.java | 24 ++--- .../flowable/FlowableWindowWithTimeTest.java | 22 ++-- .../flowable/FlowableWithLatestFromTest.java | 24 ++--- .../flowable/FlowableZipCompletionTest.java | 10 +- .../flowable/FlowableZipIterableTest.java | 19 ++-- .../operators/flowable/FlowableZipTest.java | 27 ++--- .../flowable/NotificationLiteTest.java | 14 +-- .../maybe/AbstractMaybeWithUpstreamTest.java | 12 +-- .../operators/maybe/MaybeAmbTest.java | 24 ++--- .../operators/maybe/MaybeCacheTest.java | 20 ++-- .../maybe/MaybeCallbackObserverTest.java | 22 ++-- .../operators/maybe/MaybeConcatArrayTest.java | 14 +-- .../maybe/MaybeConcatIterableTest.java | 16 +-- .../maybe/MaybeConcatPublisherTest.java | 4 +- .../operators/maybe/MaybeContainsTest.java | 16 +-- .../operators/maybe/MaybeCountTest.java | 16 +-- .../operators/maybe/MaybeCreateTest.java | 12 +-- .../operators/maybe/MaybeDelayOtherTest.java | 16 +-- .../maybe/MaybeDelaySubscriptionTest.java | 20 ++-- .../operators/maybe/MaybeDelayTest.java | 16 +-- .../operators/maybe/MaybeDetachTest.java | 16 +-- .../maybe/MaybeDoAfterSuccessTest.java | 18 ++-- .../operators/maybe/MaybeDoFinallyTest.java | 16 +-- .../operators/maybe/MaybeDoOnEventTest.java | 16 +-- .../maybe/MaybeDoOnTerminateTest.java | 11 +- .../operators/maybe/MaybeEmptyTest.java | 7 +- .../operators/maybe/MaybeEqualTest.java | 10 +- .../operators/maybe/MaybeErrorTest.java | 9 +- .../maybe/MaybeFilterSingleTest.java | 14 +-- .../maybe/MaybeFlatMapBiSelectorTest.java | 14 +-- .../maybe/MaybeFlatMapCompletableTest.java | 10 +- .../MaybeFlatMapIterableFlowableTest.java | 20 ++-- .../MaybeFlatMapIterableObservableTest.java | 20 ++-- .../maybe/MaybeFlatMapNotificationTest.java | 12 +-- .../maybe/MaybeFlatMapSingleElementTest.java | 10 +- .../maybe/MaybeFlatMapSingleTest.java | 10 +- .../operators/maybe/MaybeFlattenTest.java | 10 +- .../operators/maybe/MaybeFromActionTest.java | 14 +-- .../maybe/MaybeFromCallableTest.java | 17 +-- .../maybe/MaybeFromCompletableTest.java | 15 +-- .../operators/maybe/MaybeFromFutureTest.java | 13 ++- .../maybe/MaybeFromRunnableTest.java | 14 +-- .../operators/maybe/MaybeFromSingleTest.java | 12 +-- .../maybe/MaybeFromSupplierTest.java | 17 +-- .../operators/maybe/MaybeHideTest.java | 14 +-- .../maybe/MaybeIgnoreElementTest.java | 10 +- .../maybe/MaybeIsEmptySingleTest.java | 9 +- .../operators/maybe/MaybeIsEmptyTest.java | 15 +-- .../operators/maybe/MaybeJustTest.java | 7 +- .../operators/maybe/MaybeMapTest.java | 10 +- .../operators/maybe/MaybeMaterializeTest.java | 12 +-- .../operators/maybe/MaybeMergeArrayTest.java | 20 ++-- .../operators/maybe/MaybeMergeTest.java | 10 +- .../operators/maybe/MaybeMergeWithTest.java | 5 +- .../operators/maybe/MaybeOfTypeTest.java | 14 +-- .../operators/maybe/MaybeOnErrorXTest.java | 14 +-- .../operators/maybe/MaybePeekTest.java | 20 ++-- .../operators/maybe/MaybeSubscribeOnTest.java | 8 +- .../maybe/MaybeSwitchIfEmptySingleTest.java | 16 +-- .../maybe/MaybeSwitchIfEmptyTest.java | 14 +-- .../maybe/MaybeTakeUntilPublisherTest.java | 16 +-- .../operators/maybe/MaybeTakeUntilTest.java | 18 ++-- .../maybe/MaybeTimeoutPublisherTest.java | 16 +-- .../operators/maybe/MaybeTimeoutTest.java | 16 +-- .../operators/maybe/MaybeTimerTest.java | 12 +-- .../maybe/MaybeToCompletableTest.java | 13 +-- .../operators/maybe/MaybeToFlowableTest.java | 10 +- .../maybe/MaybeToObservableTest.java | 13 +-- .../operators/maybe/MaybeToSingleTest.java | 13 +-- .../maybe/MaybeUnsubscribeOnTest.java | 16 +-- .../operators/maybe/MaybeUsingTest.java | 20 ++-- .../operators/maybe/MaybeZipArrayTest.java | 18 ++-- .../operators/maybe/MaybeZipIterableTest.java | 21 ++-- .../CompletableAndThenObservableTest.java | 12 +-- .../CompletableAndThenPublisherTest.java | 14 +-- .../FlowableConcatMapCompletableTest.java | 22 ++-- .../mixed/FlowableConcatMapMaybeTest.java | 30 +++--- .../mixed/FlowableConcatMapSingleTest.java | 32 +++--- .../FlowableSwitchMapCompletableTest.java | 22 ++-- .../mixed/FlowableSwitchMapMaybeTest.java | 24 ++--- .../mixed/FlowableSwitchMapSingleTest.java | 24 ++--- .../mixed/MaybeFlatMapObservableTest.java | 16 +-- .../mixed/MaybeFlatMapPublisherTest.java | 18 ++-- .../ObservableConcatMapCompletableTest.java | 20 ++-- .../mixed/ObservableConcatMapMaybeTest.java | 26 ++--- .../mixed/ObservableConcatMapSingleTest.java | 24 ++--- .../ObservableSwitchMapCompletableTest.java | 20 ++-- .../mixed/ObservableSwitchMapMaybeTest.java | 20 ++-- .../mixed/ObservableSwitchMapSingleTest.java | 20 ++-- .../mixed/ScalarXMapZHelperTest.java | 6 +- .../mixed/SingleFlatMapObservableTest.java | 16 +-- .../AbstractObservableWithUpstreamTest.java | 11 +- .../BlockingObservableLatestTest.java | 18 ++-- .../BlockingObservableMostRecentTest.java | 12 +-- .../BlockingObservableNextTest.java | 24 ++--- .../BlockingObservableToFutureTest.java | 15 ++- .../BlockingObservableToIteratorTest.java | 17 ++- .../internal/operators/observable/Burst.java | 11 +- .../observable/ObservableAllTest.java | 17 +-- .../observable/ObservableAmbTest.java | 26 ++--- .../observable/ObservableAnyTest.java | 17 +-- .../observable/ObservableAutoConnectTest.java | 8 +- .../observable/ObservableBlockingTest.java | 24 ++--- .../observable/ObservableBufferTest.java | 30 +++--- .../ObservableBufferUntilSubscriberTest.java | 11 +- .../observable/ObservableCacheTest.java | 27 +++-- .../observable/ObservableCastTest.java | 7 +- .../observable/ObservableCollectTest.java | 16 +-- .../ObservableCombineLatestTest.java | 27 ++--- .../ObservableConcatMapCompletableTest.java | 18 ++-- .../ObservableConcatMapEagerTest.java | 22 ++-- .../ObservableConcatMapSchedulerTest.java | 32 +++--- .../observable/ObservableConcatMapTest.java | 20 ++-- .../observable/ObservableConcatTest.java | 25 ++--- .../ObservableConcatWithCompletableTest.java | 14 +-- .../ObservableConcatWithMaybeTest.java | 14 +-- .../ObservableConcatWithSingleTest.java | 12 +-- .../observable/ObservableCountTest.java | 8 +- .../observable/ObservableCreateTest.java | 14 +-- .../observable/ObservableDebounceTest.java | 25 ++--- .../ObservableDefaultIfEmptyTest.java | 9 +- .../observable/ObservableDeferTest.java | 11 +- .../ObservableDelaySubscriptionOtherTest.java | 18 ++-- .../observable/ObservableDelayTest.java | 23 ++-- .../ObservableDematerializeTest.java | 17 +-- .../observable/ObservableDetachTest.java | 12 +-- .../observable/ObservableDistinctTest.java | 25 ++--- .../ObservableDistinctUntilChangedTest.java | 21 ++-- .../observable/ObservableDoAfterNextTest.java | 20 ++-- .../observable/ObservableDoFinallyTest.java | 24 ++--- .../observable/ObservableDoOnEachTest.java | 23 ++-- .../ObservableDoOnSubscribeTest.java | 14 +-- .../ObservableDoOnUnsubscribeTest.java | 14 +-- .../observable/ObservableElementAtTest.java | 20 ++-- .../observable/ObservableFilterTest.java | 17 +-- .../observable/ObservableFinallyTest.java | 10 +- .../observable/ObservableFirstTest.java | 13 +-- .../ObservableFlatMapCompletableTest.java | 20 ++-- .../ObservableFlatMapMaybeTest.java | 26 +++-- .../ObservableFlatMapSingleTest.java | 26 +++-- .../observable/ObservableFlatMapTest.java | 26 ++--- .../ObservableFlattenIterableTest.java | 14 +-- .../observable/ObservableForEachTest.java | 20 ++-- .../ObservableFromCallableTest.java | 19 ++-- .../ObservableFromIterableTest.java | 24 ++--- .../ObservableFromSupplierTest.java | 19 ++-- .../observable/ObservableFromTest.java | 12 +-- .../observable/ObservableGenerateTest.java | 14 +-- .../observable/ObservableGroupByTest.java | 27 ++--- .../observable/ObservableGroupJoinTest.java | 28 ++--- .../observable/ObservableHideTest.java | 13 +-- .../ObservableIgnoreElementsTest.java | 15 ++- .../ObservableInternalHelperTest.java | 6 +- .../ObservableIntervalRangeTest.java | 8 +- .../observable/ObservableIntervalTest.java | 12 +-- .../observable/ObservableJoinTest.java | 21 ++-- .../observable/ObservableLastTest.java | 11 +- .../observable/ObservableLiftTest.java | 7 +- .../ObservableMapNotificationTest.java | 18 ++-- .../observable/ObservableMapTest.java | 22 ++-- .../observable/ObservableMaterializeTest.java | 16 +-- .../ObservableMergeDelayErrorTest.java | 18 ++-- .../ObservableMergeMaxConcurrentTest.java | 19 ++-- .../observable/ObservableMergeTest.java | 25 ++--- .../ObservableMergeWithCompletableTest.java | 16 +-- .../ObservableMergeWithMaybeTest.java | 18 ++-- .../ObservableMergeWithSingleTest.java | 18 ++-- .../observable/ObservableObserveOnTest.java | 35 +++--- .../ObservableOnErrorResumeNextTest.java | 19 ++-- .../ObservableOnErrorResumeWithTest.java | 17 +-- .../ObservableOnErrorReturnTest.java | 17 +-- .../observable/ObservablePublishTest.java | 30 +++--- .../observable/ObservableRangeLongTest.java | 13 +-- .../observable/ObservableRangeTest.java | 13 +-- .../observable/ObservableRedoTest.java | 10 +- .../observable/ObservableReduceTest.java | 17 +-- .../observable/ObservableRefCountTest.java | 34 +++--- .../observable/ObservableRepeatTest.java | 26 ++--- .../ObservableReplayEagerTruncateTest.java | 36 +++---- .../observable/ObservableReplayTest.java | 38 +++---- .../ObservableResourceWrapperTest.java | 12 +-- .../observable/ObservableRetryTest.java | 31 +++--- .../ObservableRetryWithPredicateTest.java | 24 ++--- .../observable/ObservableSampleTest.java | 19 ++-- .../observable/ObservableScalarXMapTest.java | 16 +-- .../observable/ObservableScanTest.java | 24 ++--- .../ObservableSequenceEqualTest.java | 17 +-- .../observable/ObservableSerializeTest.java | 11 +- .../observable/ObservableSingleTest.java | 20 ++-- .../observable/ObservableSkipLastTest.java | 17 +-- .../ObservableSkipLastTimedTest.java | 17 +-- .../observable/ObservableSkipTest.java | 9 +- .../observable/ObservableSkipTimedTest.java | 13 +-- .../observable/ObservableSkipUntilTest.java | 11 +- .../observable/ObservableSkipWhileTest.java | 15 +-- .../observable/ObservableSubscribeOnTest.java | 16 +-- .../ObservableSwitchIfEmptyTest.java | 10 +- .../observable/ObservableSwitchTest.java | 30 +++--- .../observable/ObservableTakeLastOneTest.java | 10 +- .../observable/ObservableTakeLastTest.java | 17 +-- .../ObservableTakeLastTimedTest.java | 15 +-- .../observable/ObservableTakeTest.java | 28 ++--- .../observable/ObservableTakeTimedTest.java | 13 +-- .../ObservableTakeUntilPredicateTest.java | 19 ++-- .../observable/ObservableTakeUntilTest.java | 16 +-- .../observable/ObservableTakeWhileTest.java | 19 ++-- .../ObservableThrottleFirstTest.java | 17 +-- .../ObservableThrottleLatestTest.java | 16 +-- .../ObservableTimeIntervalTest.java | 16 +-- .../observable/ObservableTimeoutTests.java | 21 ++-- .../ObservableTimeoutWithSelectorTest.java | 28 ++--- .../observable/ObservableTimerTest.java | 23 ++-- .../observable/ObservableTimestampTest.java | 15 +-- .../observable/ObservableToFutureTest.java | 11 +- .../observable/ObservableToListTest.java | 15 +-- .../observable/ObservableToMapTest.java | 13 +-- .../observable/ObservableToMultimapTest.java | 13 +-- .../ObservableToSortedListTest.java | 11 +- .../observable/ObservableToXTest.java | 8 +- .../ObservableUnsubscribeOnTest.java | 18 ++-- .../observable/ObservableUsingTest.java | 25 +++-- .../ObservableWindowWithObservableTest.java | 26 ++--- .../ObservableWindowWithSizeTest.java | 23 ++-- ...vableWindowWithStartEndObservableTest.java | 28 ++--- .../ObservableWindowWithTimeTest.java | 24 ++--- .../ObservableWithLatestFromTest.java | 29 ++--- .../ObservableZipCompletionTest.java | 10 +- .../observable/ObservableZipIterableTest.java | 23 ++-- .../observable/ObservableZipTest.java | 25 ++--- .../operators/single/SingleAmbTest.java | 20 ++-- .../operators/single/SingleCacheTest.java | 12 +-- .../single/SingleConcatPublisherTest.java | 4 +- .../operators/single/SingleConcatTest.java | 14 ++- .../operators/single/SingleContainstTest.java | 9 +- .../operators/single/SingleCreateTest.java | 14 +-- .../operators/single/SingleDeferTest.java | 7 +- .../operators/single/SingleDelayTest.java | 22 ++-- .../single/SingleDematerializeTest.java | 14 +-- .../operators/single/SingleDetachTest.java | 16 +-- .../single/SingleDoAfterSuccessTest.java | 18 ++-- .../single/SingleDoAfterTerminateTest.java | 25 +++-- .../operators/single/SingleDoFinallyTest.java | 14 +-- .../single/SingleDoOnTerminateTest.java | 11 +- .../operators/single/SingleDoOnTest.java | 18 ++-- .../operators/single/SingleEqualsTest.java | 10 +- .../operators/single/SingleErrorTest.java | 9 +- .../single/SingleFlatMapCompletableTest.java | 8 +- .../SingleFlatMapIterableFlowableTest.java | 20 ++-- .../SingleFlatMapIterableObservableTest.java | 20 ++-- .../single/SingleFlatMapMaybeTest.java | 10 +- .../operators/single/SingleFlatMapTest.java | 10 +- .../single/SingleFromCallableTest.java | 30 +++--- .../single/SingleFromPublisherTest.java | 16 +-- .../single/SingleFromSupplierTest.java | 17 +-- .../operators/single/SingleFromTest.java | 6 +- .../operators/single/SingleHideTest.java | 12 +-- .../single/SingleInternalHelperTest.java | 6 +- .../operators/single/SingleLiftTest.java | 6 +- .../operators/single/SingleMapTest.java | 10 +- .../single/SingleMaterializeTest.java | 12 +-- .../operators/single/SingleMergeTest.java | 10 +- .../operators/single/SingleMiscTest.java | 32 +++--- .../operators/single/SingleObserveOnTest.java | 12 +-- .../operators/single/SingleOnErrorXTest.java | 10 +- .../single/SingleSubscribeOnTest.java | 16 +-- .../operators/single/SingleTakeUntilTest.java | 18 ++-- .../operators/single/SingleTimeoutTest.java | 23 ++-- .../operators/single/SingleTimerTest.java | 12 +-- .../single/SingleToFlowableTest.java | 13 ++- .../single/SingleToObservableTest.java | 10 +- .../single/SingleUnsubscribeOnTest.java | 16 +-- .../operators/single/SingleUsingTest.java | 20 ++-- .../operators/single/SingleZipArrayTest.java | 18 ++-- .../single/SingleZipIterableTest.java | 20 ++-- .../operators/single/SingleZipTest.java | 11 +- .../internal/queue/SimpleQueueTest.java | 5 +- .../schedulers/AbstractDirectTaskTest.java | 8 +- .../ComputationSchedulerInternalTest.java | 7 +- .../schedulers/DisposeOnCancelTest.java | 6 +- .../ExecutorSchedulerDelayedRunnableTest.java | 8 +- .../ImmediateThinSchedulerTest.java | 8 +- .../schedulers/InstantPeriodicTaskTest.java | 12 +-- .../schedulers/RxThreadFactoryTest.java | 6 +- .../ScheduledDirectPeriodicTaskTest.java | 10 +- .../schedulers/ScheduledRunnableTest.java | 14 +-- .../SchedulerMultiWorkerSupportTest.java | 14 +-- .../schedulers/SchedulerPoolFactoryTest.java | 10 +- .../schedulers/SchedulerWhenTest.java | 26 ++--- .../schedulers/SingleSchedulerTest.java | 19 ++-- .../TrampolineSchedulerInternalTest.java | 16 +-- ...asicFuseableConditionalSubscriberTest.java | 12 +-- .../BasicFuseableSubscriberTest.java | 12 +-- .../subscribers/BlockingSubscriberTest.java | 8 +- .../subscribers/BoundedSubscriberTest.java | 37 +++---- .../DeferredScalarSubscriberTest.java | 20 ++-- .../subscribers/EmptyComponentTest.java | 16 +-- .../subscribers/FutureSubscriberTest.java | 17 ++- .../InnerQueuedSubscriberTest.java | 9 +- .../subscribers/LambdaSubscriberTest.java | 28 ++--- .../subscribers/QueueDrainSubscriberTest.java | 18 ++-- .../SinglePostCompleteSubscriberTest.java | 10 +- .../subscribers/StrictSubscriberTest.java | 11 +- .../SubscriberResourceWrapperTest.java | 16 +-- .../ArrayCompositeSubscriptionTest.java | 6 +- .../subscriptions/AsyncSubscriptionTest.java | 7 +- .../DeferredScalarSubscriptionTest.java | 10 +- .../subscriptions/QueueSubscriptionTest.java | 10 +- .../subscriptions/ScalarSubscriptionTest.java | 10 +- .../SubscriptionArbiterTest.java | 8 +- .../subscriptions/SubscriptionHelperTest.java | 12 ++- .../internal/util/AtomicThrowableTest.java | 18 ++-- .../internal/util/BackpressureHelperTest.java | 10 +- .../internal/util/BlockingHelperTest.java | 10 +- .../internal/util/CrashingIterable.java | 4 +- .../internal/util/CrashingMappedIterable.java | 6 +- .../internal/util/EndConsumerHelperTest.java | 22 ++-- .../internal/util/ExceptionHelperTest.java | 8 +- .../util/HalfSerializerObserverTest.java | 13 ++- .../util/HalfSerializerSubscriberTest.java | 13 ++- .../internal/util/MergerBiFunctionTest.java | 5 +- .../internal/util/MiscUtilTest.java | 10 +- .../internal/util/NotificationLiteTest.java | 10 +- .../util/ObservableToFlowabeTestSync.java | 2 +- .../internal/util/OpenHashSetTest.java | 5 +- .../internal/util/QueueDrainHelperTest.java | 22 ++-- .../internal/util/TestingHelper.java | 4 +- .../util/VolatileSizeArrayListTest.java | 5 +- .../{ => rxjava3}/maybe/MaybeCreateTest.java | 14 +-- .../{ => rxjava3}/maybe/MaybeRetryTest.java | 13 +-- .../{ => rxjava3}/maybe/MaybeTest.java | 34 +++--- .../{ => rxjava3}/maybe/MaybeTimerTest.java | 13 ++- .../ObservableCombineLatestTests.java | 11 +- .../observable/ObservableConcatTests.java | 11 +- .../observable/ObservableCovarianceTest.java | 13 ++- .../observable/ObservableDoOnTest.java | 9 +- .../ObservableErrorHandlingTests.java | 8 +- .../observable/ObservableEventStream.java | 10 +- .../observable/ObservableFuseableTest.java | 9 +- .../observable/ObservableGroupByTests.java | 11 +- .../observable/ObservableMergeTests.java | 9 +- .../observable/ObservableNullTests.java | 20 ++-- .../observable/ObservableReduceTests.java | 8 +- .../observable/ObservableScanTests.java | 8 +- .../observable/ObservableStartWithTests.java | 6 +- .../observable/ObservableSubscriberTest.java | 20 ++-- .../observable/ObservableTest.java | 25 ++--- .../ObservableThrottleLastTests.java | 10 +- .../ObservableThrottleWithTimeoutTests.java | 10 +- .../observable/ObservableWindowTests.java | 8 +- .../observable/ObservableZipTests.java | 14 +-- .../DisposableCompletableObserverTest.java | 13 ++- .../DisposableMaybeObserverTest.java | 13 ++- .../observers/DisposableObserverTest.java | 14 +-- .../DisposableSingleObserverTest.java | 13 ++- .../ResourceCompletableObserverTest.java | 25 ++--- .../observers/ResourceMaybeObserverTest.java | 28 ++--- .../observers/ResourceObserverTest.java | 26 ++--- .../observers/ResourceSingleObserverTest.java | 28 ++--- .../observers/SafeObserverTest.java | 17 ++- .../observers/SerializedObserverTest.java | 15 +-- .../observers/TestObserverTest.java | 27 +++-- .../parallel/ParallelCollectTest.java | 16 +-- .../parallel/ParallelDoOnNextTryTest.java | 15 ++- .../parallel/ParallelFilterTest.java | 14 +-- .../parallel/ParallelFilterTryTest.java | 15 ++- .../parallel/ParallelFlowableTest.java | 22 ++-- .../parallel/ParallelFromPublisherTest.java | 22 ++-- .../parallel/ParallelInvalid.java | 6 +- .../parallel/ParallelJoinTest.java | 15 ++- .../parallel/ParallelMapTest.java | 16 +-- .../parallel/ParallelMapTryTest.java | 15 ++- .../parallel/ParallelPeekTest.java | 14 +-- .../parallel/ParallelReduceFullTest.java | 16 +-- .../parallel/ParallelReduceTest.java | 16 +-- .../parallel/ParallelRunOnTest.java | 24 ++--- .../parallel/ParallelSortedJoinTest.java | 18 ++-- .../plugins/RxJavaPluginsTest.java | 46 ++++---- .../processors/AsyncProcessorTest.java | 17 +-- .../processors/BehaviorProcessorTest.java | 21 ++-- .../processors/FlowableProcessorTest.java | 5 +- .../processors/MulticastProcessorTest.java | 16 +-- .../processors/PublishProcessorTest.java | 15 +-- ...ReplayProcessorBoundedConcurrencyTest.java | 12 +-- .../ReplayProcessorConcurrencyTest.java | 12 +-- .../processors/ReplayProcessorTest.java | 20 ++-- .../processors/SerializedProcessorTest.java | 15 ++- .../processors/UnicastProcessorTest.java | 18 ++-- .../AbstractSchedulerConcurrencyTests.java | 10 +- .../schedulers/AbstractSchedulerTests.java | 20 ++-- .../schedulers/CachedThreadSchedulerTest.java | 14 +-- .../schedulers/ComputationSchedulerTests.java | 14 +-- .../ExecutorSchedulerInterruptibleTest.java | 20 ++-- .../schedulers/ExecutorSchedulerTest.java | 20 ++-- .../schedulers/FailOnBlockingTest.java | 10 +- .../schedulers/NewThreadSchedulerTest.java | 12 +-- .../schedulers/SchedulerLifecycleTest.java | 8 +- .../schedulers/SchedulerTest.java | 20 ++-- .../schedulers/SchedulerTestHelper.java | 6 +- .../schedulers/SchedulerWorkerTest.java | 11 +- .../schedulers/TestSchedulerTest.java | 17 +-- .../{ => rxjava3}/schedulers/TimedTest.java | 9 +- .../schedulers/TrampolineSchedulerTest.java | 33 +++--- .../{ => rxjava3}/single/SingleCacheTest.java | 13 ++- .../{ => rxjava3}/single/SingleNullTests.java | 17 +-- .../{ => rxjava3}/single/SingleRetryTest.java | 13 +-- .../single/SingleSubscribeTest.java | 18 ++-- .../{ => rxjava3}/single/SingleTest.java | 20 ++-- .../{ => rxjava3}/single/SingleTimerTest.java | 13 ++- .../subjects/AsyncSubjectTest.java | 19 ++-- .../subjects/BehaviorSubjectTest.java | 21 ++-- .../subjects/CompletableSubjectTest.java | 12 +-- .../subjects/MaybeSubjectTest.java | 12 +-- .../subjects/PublishSubjectTest.java | 17 +-- .../ReplaySubjectBoundedConcurrencyTest.java | 18 ++-- .../ReplaySubjectConcurrencyTest.java | 18 ++-- .../subjects/ReplaySubjectTest.java | 18 ++-- .../subjects/SerializedSubjectTest.java | 16 +-- .../subjects/SingleSubjectTest.java | 12 +-- .../{ => rxjava3}/subjects/SubjectTest.java | 5 +- .../subjects/UnicastSubjectTest.java | 16 +-- .../subscribers/DefaultSubscriberTest.java | 5 +- .../subscribers/DisposableSubscriberTest.java | 12 +-- .../subscribers/ResourceSubscriberTest.java | 16 +-- .../subscribers/SafeSubscriberTest.java | 17 +-- .../subscribers/SerializedSubscriberTest.java | 16 +-- .../subscribers/TestSubscriberTest.java | 20 ++-- .../{ => rxjava3}/tck/AllTckTest.java | 6 +- .../{ => rxjava3}/tck/AmbArrayTckTest.java | 4 +- .../{ => rxjava3}/tck/AmbTckTest.java | 4 +- .../{ => rxjava3}/tck/AnyTckTest.java | 6 +- .../tck/AsyncProcessorAsPublisherTckTest.java | 6 +- .../reactivex/{ => rxjava3}/tck/BaseTck.java | 6 +- .../BehaviorProcessorAsPublisherTckTest.java | 6 +- .../tck/BufferBoundaryTckTest.java | 4 +- .../tck/BufferExactSizeTckTest.java | 4 +- .../{ => rxjava3}/tck/CacheTckTest.java | 4 +- .../{ => rxjava3}/tck/CollectTckTest.java | 8 +- .../CombineLatestArrayDelayErrorTckTest.java | 6 +- .../tck/CombineLatestArrayTckTest.java | 6 +- ...ombineLatestIterableDelayErrorTckTest.java | 6 +- .../tck/CombineLatestIterableTckTest.java | 6 +- .../CompletableAndThenPublisherTckTest.java | 4 +- .../tck/ConcatArrayEagerTckTest.java | 4 +- .../tck/ConcatIterableEagerTckTest.java | 4 +- .../tck/ConcatMapIterableTckTest.java | 6 +- .../tck/ConcatMapMaybeTckTest.java | 6 +- .../tck/ConcatMapSingleTckTest.java | 6 +- .../{ => rxjava3}/tck/ConcatMapTckTest.java | 6 +- .../tck/ConcatPublisherEagerTckTest.java | 4 +- .../tck/ConcatPublisherTckTest.java | 4 +- .../{ => rxjava3}/tck/ConcatTckTest.java | 4 +- .../tck/ConcatWithCompletableTckTest.java | 4 +- .../tck/ConcatWithMaybeEmptyTckTest.java | 4 +- .../tck/ConcatWithMaybeTckTest.java | 4 +- .../tck/ConcatWithSingleTckTest.java | 4 +- .../{ => rxjava3}/tck/CreateTckTest.java | 4 +- .../tck/DefaultIfEmptyTckTest.java | 4 +- .../{ => rxjava3}/tck/DeferTckTest.java | 6 +- .../tck/DelaySubscriptionTckTest.java | 4 +- .../{ => rxjava3}/tck/DelayTckTest.java | 4 +- .../{ => rxjava3}/tck/DistinctTckTest.java | 4 +- .../tck/DistinctUntilChangedTckTest.java | 4 +- .../{ => rxjava3}/tck/DoAfterNextTckTest.java | 6 +- .../{ => rxjava3}/tck/DoFinallyTckTest.java | 6 +- .../{ => rxjava3}/tck/DoOnNextTckTest.java | 6 +- .../{ => rxjava3}/tck/ElementAtTckTest.java | 4 +- .../{ => rxjava3}/tck/EmptyTckTest.java | 4 +- .../{ => rxjava3}/tck/FilterTckTest.java | 6 +- .../{ => rxjava3}/tck/FirstTckTest.java | 4 +- .../{ => rxjava3}/tck/FlatMapTckTest.java | 6 +- .../{ => rxjava3}/tck/FromArrayTckTest.java | 4 +- .../tck/FromCallableTckTest.java | 6 +- .../{ => rxjava3}/tck/FromFutureTckTest.java | 4 +- .../tck/FromIterableTckTest.java | 4 +- .../tck/FromSupplierTckTest.java | 8 +- .../{ => rxjava3}/tck/GenerateTckTest.java | 8 +- .../{ => rxjava3}/tck/GroupByTckTest.java | 8 +- .../{ => rxjava3}/tck/HideTckTest.java | 4 +- .../tck/IgnoreElementsTckTest.java | 4 +- .../tck/IntervalRangeTckTest.java | 4 +- .../{ => rxjava3}/tck/IntervalTckTest.java | 4 +- .../{ => rxjava3}/tck/IsEmptyTckTest.java | 4 +- .../{ => rxjava3}/tck/JustTckTest.java | 4 +- .../{ => rxjava3}/tck/LastTckTest.java | 4 +- .../{ => rxjava3}/tck/LimitTckTest.java | 4 +- .../{ => rxjava3}/tck/MapTckTest.java | 6 +- .../tck/MaybeFlatMapPublisherTckTest.java | 6 +- .../tck/MergeIterableTckTest.java | 4 +- .../tck/MergePublisherTckTest.java | 4 +- .../{ => rxjava3}/tck/MergeTckTest.java | 4 +- .../tck/MergeWithCompletableTckTest.java | 4 +- .../tck/MergeWithMaybeEmptyTckTest.java | 4 +- .../tck/MergeWithMaybeTckTest.java | 4 +- .../tck/MergeWithSingleTckTest.java | 4 +- .../MulticastProcessorAsPublisherTckTest.java | 6 +- .../MulticastProcessorRefCountedTckTest.java | 6 +- .../tck/MulticastProcessorTckTest.java | 6 +- .../{ => rxjava3}/tck/ObserveOnTckTest.java | 6 +- .../tck/OnBackpressureBufferTckTest.java | 4 +- .../tck/OnErrorResumeWithTckTest.java | 4 +- .../tck/OnErrorReturnItemTckTest.java | 4 +- .../PublishProcessorAsPublisherTckTest.java | 6 +- .../tck/PublishSelectorTckTest.java | 8 +- .../{ => rxjava3}/tck/PublishTckTest.java | 4 +- .../{ => rxjava3}/tck/RangeTckTest.java | 4 +- .../tck/RebatchRequestsTckTest.java | 4 +- .../{ => rxjava3}/tck/ReduceTckTest.java | 6 +- .../{ => rxjava3}/tck/ReduceWithTckTest.java | 8 +- .../{ => rxjava3}/tck/RefCountProcessor.java | 8 +- .../{ => rxjava3}/tck/RepeatTckTest.java | 4 +- ...yProcessorSizeBoundAsPublisherTckTest.java | 6 +- ...yProcessorTimeBoundAsPublisherTckTest.java | 6 +- ...yProcessorUnboundedAsPublisherTckTest.java | 6 +- .../tck/ReplaySelectorTckTest.java | 8 +- .../{ => rxjava3}/tck/ReplayTckTest.java | 4 +- .../{ => rxjava3}/tck/RetryTckTest.java | 4 +- .../{ => rxjava3}/tck/ScanTckTest.java | 6 +- .../tck/SequenceEqualTckTest.java | 4 +- .../{ => rxjava3}/tck/ShareTckTest.java | 4 +- .../tck/SingleFlatMapFlowableTckTest.java | 6 +- .../{ => rxjava3}/tck/SingleTckTest.java | 4 +- .../{ => rxjava3}/tck/SkipLastTckTest.java | 4 +- .../{ => rxjava3}/tck/SkipTckTest.java | 4 +- .../{ => rxjava3}/tck/SkipUntilTckTest.java | 4 +- .../{ => rxjava3}/tck/SkipWhileTckTest.java | 6 +- .../{ => rxjava3}/tck/SortedTckTest.java | 4 +- .../{ => rxjava3}/tck/SubscribeOnTckTest.java | 6 +- .../tck/SwitchIfEmptyTckTest.java | 4 +- .../tck/SwitchMapDelayErrorTckTest.java | 6 +- .../{ => rxjava3}/tck/SwitchMapTckTest.java | 6 +- .../tck/SwitchOnNextTckTest.java | 4 +- .../{ => rxjava3}/tck/TakeLastTckTest.java | 4 +- .../{ => rxjava3}/tck/TakeTckTest.java | 4 +- .../{ => rxjava3}/tck/TakeUntilTckTest.java | 4 +- .../{ => rxjava3}/tck/TakeWhileTckTest.java | 6 +- .../tck/TimeIntervalTckTest.java | 6 +- .../{ => rxjava3}/tck/TimeoutTckTest.java | 4 +- .../{ => rxjava3}/tck/TimerTckTest.java | 6 +- .../{ => rxjava3}/tck/TimestampTckTest.java | 6 +- .../{ => rxjava3}/tck/ToListTckTest.java | 4 +- .../{ => rxjava3}/tck/ToMapTckTest.java | 6 +- .../{ => rxjava3}/tck/ToMultimapTckTest.java | 6 +- .../tck/ToSortedListTckTest.java | 4 +- .../UnicastProcessorAsPublisherTckTest.java | 6 +- .../tck/UnicastProcessorTckTest.java | 6 +- .../tck/UnsubscribeOnTckTest.java | 6 +- .../{ => rxjava3}/tck/UsingTckTest.java | 6 +- .../tck/WindowBoundaryTckTest.java | 8 +- .../tck/WindowExactSizeTckTest.java | 8 +- .../tck/WithLatestFromTckTest.java | 6 +- .../{ => rxjava3}/tck/ZipIterableTckTest.java | 6 +- .../{ => rxjava3}/tck/ZipTckTest.java | 6 +- .../tck/ZipWithIterableTckTest.java | 6 +- .../{ => rxjava3}/tck/ZipWithTckTest.java | 6 +- .../testsupport/BaseTestConsumerEx.java | 12 +-- .../{ => rxjava3}/testsupport/TestHelper.java | 44 ++++---- .../testsupport/TestObserverEx.java | 10 +- .../testsupport/TestObserverExTest.java | 26 ++--- .../testsupport/TestSubscriberEx.java | 8 +- .../testsupport/TestSubscriberExTest.java | 20 ++-- .../testsupport/TimesteppingScheduler.java | 6 +- .../validators/BaseTypeAnnotations.java | 6 +- .../validators/BaseTypeParser.java | 2 +- .../CheckLocalVariablesInTests.java | 6 +- .../validators/FixLicenseHeaders.java | 6 +- .../validators/InternalWrongNaming.java | 6 +- .../JavadocFindUnescapedAngleBrackets.java | 6 +- .../validators/JavadocForAnnotations.java | 8 +- .../validators/JavadocWording.java | 9 +- .../validators/MaybeNo2Dot0Since.java | 6 +- .../validators/NewLinesBeforeAnnotation.java | 6 +- .../NoAnonymousInnerClassesTest.java | 2 +- .../validators/OperatorsAreFinal.java | 8 +- .../ParamValidationCheckerTest.java | 24 ++--- .../validators/PublicFinalMethods.java | 4 +- .../validators/TestPrefixInMethodName.java | 18 ++-- .../validators/TextualAorAn.java | 6 +- .../validators/TooManyEmptyNewLines.java | 6 +- 1670 files changed, 10642 insertions(+), 10715 deletions(-) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/BinaryFlatMapPerf.java (99%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/BlockingGetPerf.java (98%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/BlockingPerf.java (98%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/CallableAsyncPerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/EachTypeFlatMapPerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlatMapJustPerf.java (96%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlattenCrossMapPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlattenJustPerf.java (96%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlattenRangePerf.java (94%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlowableFlatMapCompletableAsyncPerf.java (92%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/FlowableFlatMapCompletableSyncPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/InputWithIncrementingInteger.java (94%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/JustAsyncPerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/LatchedSingleObserver.java (93%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/MemoryPerf.java (72%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/ObservableFlatMapPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/OperatorFlatMapPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/OperatorMergePerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfAsyncConsumer.java (92%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfBoundedSubscriber.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfConsumer.java (94%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfInteropConsumer.java (94%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfObserver.java (93%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PerfSubscriber.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/PublishProcessorPerf.java (94%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/RangePerf.java (93%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/ReducePerf.java (96%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/RxVsStreamPerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/StrictPerf.java (98%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/TakeUntilPerf.java (93%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/ToFlowablePerf.java (97%) rename src/jmh/java/io/reactivex/{ => rxjava3/core}/XMapYPerf.java (99%) rename src/jmh/java/io/reactivex/{ => rxjava3}/parallel/ParallelPerf.java (93%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableConcatMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableConcatMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableConcatMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableConcatMapSinglePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableFlatMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableFlatMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableFlatMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableFlatMapSinglePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableSwitchMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableSwitchMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableSwitchMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/FlowableSwitchMapSinglePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableConcatMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableConcatMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableConcatMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableConcatMapSinglePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableFlatMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableFlatMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableFlatMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableFlatMapSinglePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableSwitchMapCompletablePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableSwitchMapMaybeEmptyPerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableSwitchMapMaybePerf.java (95%) rename src/jmh/java/io/reactivex/{ => rxjava3}/xmapz/ObservableSwitchMapSinglePerf.java (95%) delete mode 100644 src/main/java/io/reactivex/parallel/package-info.java rename src/main/java/io/reactivex/{ => rxjava3}/annotations/BackpressureKind.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/BackpressureSupport.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/Beta.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/CheckReturnValue.java (78%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/Experimental.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/NonNull.java (69%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/Nullable.java (69%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/SchedulerSupport.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/annotations/package-info.java (94%) rename src/main/java/io/reactivex/{ => rxjava3/core}/BackpressureOverflowStrategy.java (96%) rename src/main/java/io/reactivex/{ => rxjava3/core}/BackpressureStrategy.java (97%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Completable.java (98%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableEmitter.java (91%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableObserver.java (95%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableOnSubscribe.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableOperator.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableSource.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/CompletableTransformer.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Emitter.java (94%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Flowable.java (99%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableEmitter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableOnSubscribe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableOperator.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableSubscriber.java (94%) rename src/main/java/io/reactivex/{ => rxjava3/core}/FlowableTransformer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Maybe.java (99%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeEmitter.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeObserver.java (96%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeOnSubscribe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeOperator.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeSource.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/MaybeTransformer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Notification.java (96%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Observable.java (99%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableEmitter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableOnSubscribe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableOperator.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableSource.java (92%) rename src/main/java/io/reactivex/{ => rxjava3/core}/ObservableTransformer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Observer.java (94%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Scheduler.java (96%) rename src/main/java/io/reactivex/{ => rxjava3/core}/Single.java (99%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleEmitter.java (91%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleObserver.java (96%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleOnSubscribe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleOperator.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleSource.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/SingleTransformer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3/core}/package-info.java (72%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/ActionDisposable.java (83%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/CompositeDisposable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/Disposable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/Disposables.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/FutureDisposable.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/ReferenceDisposable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/RunnableDisposable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/SerialDisposable.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/SubscriptionDisposable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/disposables/package-info.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/CompositeException.java (99%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/Exceptions.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/MissingBackpressureException.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/OnErrorNotImplementedException.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/ProtocolViolationException.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/UndeliverableException.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/exceptions/package-info.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/flowables/ConnectableFlowable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/flowables/GroupedFlowable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/flowables/package-info.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Action.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/BiConsumer.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/BiFunction.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/BiPredicate.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/BooleanSupplier.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Cancellable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Consumer.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function3.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function4.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function5.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function6.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function7.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function8.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Function9.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/IntFunction.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/LongConsumer.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Predicate.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/Supplier.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/functions/package-info.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/ArrayCompositeDisposable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/CancellableDisposable.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/DisposableContainer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/DisposableHelper.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/EmptyDisposable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/ListCompositeDisposable.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/disposables/SequentialDisposable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/functions/Functions.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/functions/ObjectHelper.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/ConditionalSubscriber.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/FuseToFlowable.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/FuseToMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/FuseToObservable.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/HasUpstreamCompletableSource.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/HasUpstreamMaybeSource.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/HasUpstreamObservableSource.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/HasUpstreamPublisher.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/HasUpstreamSingleSource.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/QueueDisposable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/QueueFuseable.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/QueueSubscription.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/ScalarSupplier.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/SimplePlainQueue.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/SimpleQueue.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/fuseable/package-info.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BasicFuseableObserver.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BasicIntQueueDisposable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BasicQueueDisposable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BiConsumerSingleObserver.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingBaseObserver.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingFirstObserver.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingLastObserver.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingMultiObserver.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingObserver.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/CallbackCompletableObserver.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/ConsumerSingleObserver.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/DeferredScalarDisposable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/DeferredScalarObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/DisposableLambdaObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/EmptyCompletableObserver.java (79%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/ForEachWhileObserver.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/FutureObserver.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/FutureSingleObserver.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/InnerQueuedObserver.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/InnerQueuedObserverSupport.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/LambdaObserver.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/QueueDrainObserver.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/ResumeSingleObserver.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/observers/SubscriberCompletableObserver.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAmb.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAndThenCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableCache.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableConcat.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableConcatArray.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableConcatIterable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableCreate.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDefer.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDelay.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDetach.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDisposeOn.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDoFinally.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDoOnEvent.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableEmpty.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableError.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableErrorSupplier.java (79%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromAction.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromCallable.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromObservable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromPublisher.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromRunnable.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromSingle.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromSupplier.java (83%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromUnsafeSource.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableHide.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableLift.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMaterialize.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMerge.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeArray.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeDelayErrorArray.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeDelayErrorIterable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeIterable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableNever.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableObserveOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableOnErrorComplete.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletablePeek.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableResumeNext.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableSubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTakeUntilCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTimeout.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTimer.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableToFlowable.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableToObservable.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableToSingle.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableUsing.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/AbstractFlowableWithUpstream.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableIterable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableLatest.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableMostRecent.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableNext.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAll.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAllSingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAmb.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAny.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAnySingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAutoConnect.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBlockingSubscribe.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBuffer.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBufferBoundary.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBufferExactBoundary.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBufferTimed.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCache.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCollect.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCollectSingle.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCombineLatest.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatArray.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMap.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapEager.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapEagerPublisher.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapPublisher.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapScheduler.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithCompletable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithMaybe.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithSingle.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCount.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCountSingle.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCreate.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDebounce.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDebounceTimed.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDefer.java (79%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDelay.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDelaySubscriptionOther.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDematerialize.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDetach.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDistinct.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDistinctUntilChanged.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoAfterNext.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoFinally.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnEach.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnLifecycle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableElementAt.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableElementAtMaybe.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableElementAtSingle.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableEmpty.java (83%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableError.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFilter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMap.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapCompletable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapMaybe.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapPublisher.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapSingle.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlattenIterable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromArray.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromCallable.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromFuture.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromIterable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromObservable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromPublisher.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromSupplier.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGenerate.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGroupBy.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGroupJoin.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableHide.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIgnoreElements.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIgnoreElementsCompletable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableInternalHelper.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableInterval.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIntervalRange.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableJoin.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableJust.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLastMaybe.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLastSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLift.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLimit.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMap.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMapNotification.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMapPublisher.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMaterialize.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithMaybe.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithSingle.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableNever.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableObserveOn.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureBuffer.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureDrop.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureError.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureLatest.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnErrorNext.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnErrorReturn.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowablePublish.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowablePublishMulticast.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRange.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRangeLong.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduce.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduceMaybe.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduceSeedSingle.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduceWithSingle.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRefCount.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRepeat.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRepeatUntil.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRepeatWhen.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReplay.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRetryBiPredicate.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRetryPredicate.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRetryWhen.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSamplePublisher.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSampleTimed.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableScalarXMap.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableScan.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableScanSeed.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSequenceEqual.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSequenceEqualSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSerialized.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSingle.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSingleMaybe.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSingleSingle.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkip.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipLast.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipLastTimed.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipUntil.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipWhile.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSubscribeOn.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSwitchIfEmpty.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSwitchMap.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTake.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLast.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLastOne.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLastTimed.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakePublisher.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeUntil.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeUntilPredicate.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeWhile.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableThrottleFirstTimed.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableThrottleLatest.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeInterval.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeout.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeoutTimed.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimer.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToList.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToListSingle.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableUnsubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableUsing.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindow.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowBoundary.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowBoundarySelector.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowTimed.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWithLatestFrom.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWithLatestFromMany.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableZip.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableZipIterable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/AbstractMaybeWithUpstream.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeAmb.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCache.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCallbackObserver.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatArray.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatArrayDelayError.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatIterable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeContains.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCount.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCreate.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDefer.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelay.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelayOtherPublisher.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelayWithCompletable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDetach.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoAfterSuccess.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoFinally.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoOnEvent.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoOnTerminate.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeEmpty.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeEqualSingle.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeError.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeErrorCallable.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFilter.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFilterSingle.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapBiSelector.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapCompletable.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapIterableFlowable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapIterableObservable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapNotification.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapSingle.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapSingleElement.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatten.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromAction.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromCallable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromCompletable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromFuture.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromRunnable.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromSingle.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromSupplier.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeHide.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIgnoreElement.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIgnoreElementCompletable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIsEmpty.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIsEmptySingle.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeJust.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeLift.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMap.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMaterialize.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMergeArray.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeNever.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeObserveOn.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeOnErrorComplete.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeOnErrorNext.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeOnErrorReturn.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybePeek.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSubscribeOn.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSwitchIfEmpty.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSwitchIfEmptySingle.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTakeUntilMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTakeUntilPublisher.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimeoutMaybe.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimeoutPublisher.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimer.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToFlowable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToObservable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToPublisher.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToSingle.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeUnsafeCreate.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeUnsubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeUsing.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeZipArray.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeZipIterable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/CompletableAndThenObservable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/CompletableAndThenPublisher.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapCompletable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapMaybe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapCompletable.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapSingle.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/MaterializeSingleObserver.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/MaybeFlatMapObservable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/MaybeFlatMapPublisher.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapMaybe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapSingle.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ScalarXMapZHelper.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/SingleFlatMapObservable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/AbstractObservableWithUpstream.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableIterable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableLatest.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableMostRecent.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableNext.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAll.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAllSingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAmb.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAny.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAnySingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAutoConnect.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBlockingSubscribe.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBuffer.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBufferBoundary.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBufferExactBoundary.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBufferTimed.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCache.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCollect.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCollectSingle.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCombineLatest.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMap.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapEager.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapScheduler.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithCompletable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithMaybe.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCount.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCountSingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCreate.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDebounce.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDebounceTimed.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDefer.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDelay.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDelaySubscriptionOther.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDematerialize.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDetach.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDistinct.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDistinctUntilChanged.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoAfterNext.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoFinally.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoOnEach.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoOnLifecycle.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableElementAt.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableElementAtMaybe.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableElementAtSingle.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableEmpty.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableError.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFilter.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMap.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapCompletable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapCompletableCompletable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlattenIterable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromArray.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromCallable.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromFuture.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromIterable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromPublisher.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromSupplier.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromUnsafeSource.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGenerate.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGroupBy.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGroupJoin.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableHide.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIgnoreElements.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIgnoreElementsCompletable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableInternalHelper.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableInterval.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIntervalRange.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableJoin.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableJust.java (81%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableLastMaybe.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableLastSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableLift.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMap.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMapNotification.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMaterialize.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithCompletable.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithMaybe.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithSingle.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableNever.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableObserveOn.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableOnErrorNext.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableOnErrorReturn.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservablePublish.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservablePublishSelector.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRange.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRangeLong.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReduceMaybe.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReduceSeedSingle.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReduceWithSingle.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRefCount.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRepeat.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRepeatUntil.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRepeatWhen.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReplay.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRetryBiPredicate.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRetryPredicate.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRetryWhen.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSampleTimed.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSampleWithObservable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableScalarXMap.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableScan.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableScanSeed.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSequenceEqual.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSequenceEqualSingle.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSerialized.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSingleMaybe.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSingleSingle.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkip.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipLast.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipLastTimed.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipUntil.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipWhile.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSwitchIfEmpty.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSwitchMap.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTake.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLast.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLastOne.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLastTimed.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeUntil.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeUntilPredicate.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeWhile.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableThrottleFirstTimed.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableThrottleLatest.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeInterval.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeout.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeoutTimed.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimer.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToList.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToListSingle.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableUnsubscribeOn.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableUsing.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindow.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowBoundary.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowBoundarySelector.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowTimed.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWithLatestFrom.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWithLatestFromMany.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableZip.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableZipIterable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObserverResourceWrapper.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelCollect.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelConcatMap.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelDoOnNextTry.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelFilter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelFilterTry.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelFlatMap.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelFromArray.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelFromPublisher.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelJoin.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelMap.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelMapTry.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelPeek.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelReduce.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelReduceFull.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelRunOn.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/parallel/ParallelSortedJoin.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleAmb.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleCache.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleContains.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleCreate.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDefer.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelay.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelayWithCompletable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelayWithObservable.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelayWithPublisher.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelayWithSingle.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDematerialize.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDetach.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoAfterSuccess.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoAfterTerminate.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoFinally.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnDispose.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnError.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnEvent.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnSubscribe.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnSuccess.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnTerminate.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleEquals.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleError.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMap.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapCompletable.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapIterableFlowable.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapIterableObservable.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapMaybe.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapPublisher.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromCallable.java (83%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromPublisher.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromSupplier.java (82%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromUnsafeSource.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleHide.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleInternalHelper.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleJust.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleLift.java (83%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMap.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMaterialize.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleNever.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleObserveOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleOnErrorReturn.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleResumeNext.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleSubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTakeUntil.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTimeout.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTimer.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleToFlowable.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleToObservable.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleUnsubscribeOn.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleUsing.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleZipArray.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleZipIterable.java (86%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/queue/MpscLinkedQueue.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/queue/SpscArrayQueue.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/queue/SpscLinkedArrayQueue.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/AbstractDirectTask.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ComputationScheduler.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/DisposeOnCancel.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ExecutorScheduler.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ImmediateThinScheduler.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/InstantPeriodicTask.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/IoScheduler.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/NewThreadScheduler.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/NewThreadWorker.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/NonBlockingThread.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/RxThreadFactory.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ScheduledDirectPeriodicTask.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ScheduledDirectTask.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/ScheduledRunnable.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerMultiWorkerSupport.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerPoolFactory.java (99%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerWhen.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/SingleScheduler.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/schedulers/TrampolineScheduler.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BasicFuseableConditionalSubscriber.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BasicFuseableSubscriber.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BlockingBaseSubscriber.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BlockingFirstSubscriber.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BlockingLastSubscriber.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BlockingSubscriber.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/BoundedSubscriber.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/DeferredScalarSubscriber.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/ForEachWhileSubscriber.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/FutureSubscriber.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/InnerQueuedSubscriber.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/InnerQueuedSubscriberSupport.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/LambdaSubscriber.java (87%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/QueueDrainSubscriber.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/SinglePostCompleteSubscriber.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/StrictSubscriber.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscribers/SubscriberResourceWrapper.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/ArrayCompositeSubscription.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/AsyncSubscription.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/BasicIntQueueSubscription.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/BasicQueueSubscription.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/BooleanSubscription.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/DeferredScalarSubscription.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/EmptySubscription.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/ScalarSubscription.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/SubscriptionArbiter.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/subscriptions/SubscriptionHelper.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/AppendOnlyLinkedArrayList.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ArrayListSupplier.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/AtomicThrowable.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/BackpressureHelper.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/BlockingHelper.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/BlockingIgnoringReceiver.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ConnectConsumer.java (85%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/EmptyComponent.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/EndConsumerHelper.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ErrorMode.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ExceptionHelper.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/HalfSerializer.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/HashMapSupplier.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/LinkedArrayList.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ListAddBiConsumer.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/MergerBiFunction.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/NotificationLite.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/ObservableQueueDrain.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/OpenHashSet.java (99%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/Pow2.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/QueueDrain.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/QueueDrainHelper.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/SorterFunction.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/SuppressAnimalSniffer.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/internal/util/VolatileSizeArrayList.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/observables/ConnectableObservable.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/observables/GroupedObservable.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/observables/package-info.java (79%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/BaseTestConsumer.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/DefaultObserver.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/DisposableCompletableObserver.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/DisposableMaybeObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/DisposableObserver.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/DisposableSingleObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/LambdaConsumerIntrospection.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/ResourceCompletableObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/ResourceMaybeObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/ResourceObserver.java (88%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/ResourceSingleObserver.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/SafeObserver.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/SerializedObserver.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/TestObserver.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/observers/package-info.java (70%) rename src/main/java/io/reactivex/{ => rxjava3}/parallel/ParallelFailureHandling.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/parallel/ParallelFlowable.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/parallel/ParallelFlowableConverter.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/parallel/ParallelTransformer.java (93%) create mode 100644 src/main/java/io/reactivex/rxjava3/parallel/package-info.java rename src/main/java/io/reactivex/{ => rxjava3}/plugins/RxJavaPlugins.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/plugins/package-info.java (84%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/AsyncProcessor.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/BehaviorProcessor.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/FlowableProcessor.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/MulticastProcessor.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/PublishProcessor.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/ReplayProcessor.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/SerializedProcessor.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/UnicastProcessor.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/processors/package-info.java (51%) rename src/main/java/io/reactivex/{ => rxjava3}/schedulers/SchedulerRunnableIntrospection.java (80%) rename src/main/java/io/reactivex/{ => rxjava3}/schedulers/Schedulers.java (89%) rename src/main/java/io/reactivex/{ => rxjava3}/schedulers/TestScheduler.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/schedulers/Timed.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/schedulers/package-info.java (72%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/AsyncSubject.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/BehaviorSubject.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/CompletableSubject.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/MaybeSubject.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/PublishSubject.java (94%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/ReplaySubject.java (98%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/SerializedSubject.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/SingleSubject.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/Subject.java (91%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/UnicastSubject.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/subjects/package-info.java (51%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/DefaultSubscriber.java (93%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/DisposableSubscriber.java (92%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/ResourceSubscriber.java (90%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/SafeSubscriber.java (96%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/SerializedSubscriber.java (95%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/TestSubscriber.java (97%) rename src/main/java/io/reactivex/{ => rxjava3}/subscribers/package-info.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/completable/CapturingUncaughtExceptionHandler.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/completable/CompletableRetryTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/completable/CompletableTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/completable/CompletableTimerTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3/core}/BackpressureEnumTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3/core}/ConverterTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3/core}/NotificationTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3/core}/Retry.java (98%) rename src/test/java/io/reactivex/{ => rxjava3/core}/RxJavaTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3/core}/TransformerTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3/core}/XFlatMapTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/disposables/CompositeDisposableTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/disposables/DisposablesTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/disposables/FutureDisposableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/disposables/SequentialDisposableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/disposables/SerialDisposableTests.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/exceptions/CompositeExceptionTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/exceptions/ExceptionsTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/exceptions/OnErrorNotImplementedExceptionTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/exceptions/TestException.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/Burst.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableBackpressureTests.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableCollectTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableCombineLatestTests.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableConcatTests.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableConversionTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableCovarianceTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableDoAfterNextTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableDoOnTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableErrorHandlingTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableEventStream.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableEventStreamTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableFuseableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableGroupByTests.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableMergeTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableNotificationTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableNullTests.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableReduceTests.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableStartWithTests.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableSubscriberTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableTests.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableThrottleLastTests.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableThrottleWithTimeoutTests.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableWindowTests.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/flowable/FlowableZipTests.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/SubscribeWithTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/disposables/ArrayCompositeDisposableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/disposables/CancellableDisposableTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/disposables/DisposableHelperTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/disposables/EmptyDisposableTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/disposables/ListCompositeDisposableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/functions/FunctionsTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/functions/ObjectHelperTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/BasicFuseableObserverTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/BasicQueueDisposableTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingFirstObserverTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingMultiObserverTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/BlockingObserverTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/CallbackCompletableObserverTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/ConsumerSingleObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/DeferredScalarObserverTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/DisposableLambdaObserverTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/EmptyCompletableObserverTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/FutureObserverTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/FutureSingleObserverTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/LambdaObserverTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/observers/QueueDrainObserverTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAmbTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAndThenCompletableabTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAndThenTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableAwaitTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableCacheTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableConcatTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableCreateTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDelaySubscriptionTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDelayTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDetachTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDisposeOnTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDoFinallyTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableDoOnTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromActionTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromCallableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromMaybeTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromObservableTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromPublisherTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromRunnableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromSingleTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableFromSupplierTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableHideTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableLiftTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMaterializeTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeIterableTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableMergeTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableObserveOnTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableOnErrorXTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletablePeekTest.java (77%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableRepeatWhenTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableResumeNextTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableSubscribeOnTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableSubscribeTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTakeUntilTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTimeoutTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableTimerTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableToFlowableTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableToObservableTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableUnsafeTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/completable/CompletableUsingTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java (81%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableLatestTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableMostRecentTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableNextTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableToFutureTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BlockingFlowableToIteratorTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/BufferUntilSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAllTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAmbTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAnyTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAsObservableTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableAutoConnectTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBlockingTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableBufferTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCacheTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCastTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCombineLatestTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatDelayErrorTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapEagerTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapSchedulerTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatMapTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithCompletableTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithMaybeTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableConcatWithSingleTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCountTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableCreateTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDebounceTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDefaultIfEmptyTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDeferTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDelayTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDematerializeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDetachTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDistinctTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDistinctUntilChangedTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoAfterNextTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoAfterTerminateTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoFinallyTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnEachTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnLifecycleTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnRequestTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnSubscribeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableElementAtTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFilterTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFirstTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapCompletableTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapMaybeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapSingleTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlatMapTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFlattenIterableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableForEachTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromArrayTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromCallableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromIterableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromObservableTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromSourceTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableFromSupplierTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGenerateTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGroupByTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableGroupJoinTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableHideTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIgnoreElementsTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableInternalHelperTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIntervalRangeTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableIntervalTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableJoinTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLastTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLiftTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableLimitTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMapNotificationTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMapTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMaterializeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeDelayErrorTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithCompletableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithMaybeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableMergeWithSingleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableObserveOnTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureBufferTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureDropTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureErrorTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnBackpressureLatestTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableOnErrorReturnTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowablePublishFunctionTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowablePublishMulticastTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowablePublishTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRangeLongTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRangeTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduceTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReduceWithSingleTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRefCountTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRepeatTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReplayEagerTruncateTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableReplayTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRetryTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableRetryWithPredicateTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSampleTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableScalarXMapTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableScanTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSequenceEqualTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSerializeTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSingleTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipLastTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipLastTimedTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipTimedTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipUntilTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSkipWhileTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSubscribeOnTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSwitchIfEmptyTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableSwitchTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLastOneTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLastTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeLastTimedTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeTimedTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeUntilPredicateTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeUntilTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTakeWhileTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableThrottleFirstTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableThrottleLatestTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeIntervalTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeoutTests.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimerTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableTimestampTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToCompletableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToFutureTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToListTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToMapTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToMultimapTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToSingleTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableToSortedListTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableUnsubscribeOnTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableUsingTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowWithFlowableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowWithSizeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWindowWithTimeTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableWithLatestFromTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableZipCompletionTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableZipIterableTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/FlowableZipTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/flowable/NotificationLiteTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java (78%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeAmbTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCacheTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCallbackObserverTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatArrayTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatIterableTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeConcatPublisherTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeContainsTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCountTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeCreateTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelayOtherTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelaySubscriptionTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDelayTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDetachTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoAfterSuccessTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoFinallyTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoOnEventTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeDoOnTerminateTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeEmptyTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeEqualTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeErrorTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFilterSingleTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapCompletableTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapNotificationTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapSingleElementTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlatMapSingleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFlattenTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromActionTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromCallableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromCompletableTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromFutureTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromRunnableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromSingleTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeFromSupplierTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeHideTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIgnoreElementTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIsEmptySingleTest.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeIsEmptyTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeJustTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMapTest.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMaterializeTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMergeArrayTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMergeTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeMergeWithTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeOfTypeTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeOnErrorXTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybePeekTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSubscribeOnTest.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeSwitchIfEmptyTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTakeUntilPublisherTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTakeUntilTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimeoutPublisherTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimeoutTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeTimerTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToCompletableTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToFlowableTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToObservableTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeToSingleTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeUnsubscribeOnTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeUsingTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeZipArrayTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/maybe/MaybeZipIterableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/CompletableAndThenObservableTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/CompletableAndThenPublisherTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapCompletableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapMaybeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableConcatMapSingleTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapCompletableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapMaybeTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/FlowableSwitchMapSingleTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/MaybeFlatMapObservableTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/MaybeFlatMapPublisherTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapCompletableTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapMaybeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableConcatMapSingleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapCompletableTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapMaybeTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ObservableSwitchMapSingleTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/ScalarXMapZHelperTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/mixed/SingleFlatMapObservableTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/AbstractObservableWithUpstreamTest.java (77%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableLatestTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableMostRecentTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableNextTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableToFutureTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/BlockingObservableToIteratorTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/Burst.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAllTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAmbTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAnyTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableAutoConnectTest.java (81%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBlockingTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBufferTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableBufferUntilSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCacheTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCastTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCollectTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCombineLatestTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapCompletableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapEagerTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapSchedulerTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatMapTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithCompletableTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithMaybeTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableConcatWithSingleTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCountTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableCreateTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDebounceTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDefaultIfEmptyTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDeferTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDelayTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDematerializeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDetachTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDistinctTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDistinctUntilChangedTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoAfterNextTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoFinallyTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoOnEachTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoOnSubscribeTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableDoOnUnsubscribeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableElementAtTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFilterTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFinallyTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFirstTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapCompletableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapMaybeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapSingleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlatMapTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFlattenIterableTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableForEachTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromCallableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromIterableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromSupplierTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableFromTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGenerateTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGroupByTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableGroupJoinTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableHideTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIgnoreElementsTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableInternalHelperTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIntervalRangeTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableIntervalTest.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableJoinTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableLastTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableLiftTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMapNotificationTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMapTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMaterializeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeDelayErrorTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeMaxConcurrentTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithCompletableTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithMaybeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableMergeWithSingleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableObserveOnTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableOnErrorResumeNextTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableOnErrorResumeWithTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableOnErrorReturnTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservablePublishTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRangeLongTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRangeTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRedoTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReduceTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRefCountTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRepeatTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReplayEagerTruncateTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableReplayTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableResourceWrapperTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRetryTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableRetryWithPredicateTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSampleTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableScalarXMapTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableScanTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSequenceEqualTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSerializeTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSingleTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipLastTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipLastTimedTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipTimedTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipUntilTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSkipWhileTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSubscribeOnTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSwitchIfEmptyTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableSwitchTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLastOneTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLastTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeLastTimedTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeTimedTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeUntilPredicateTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeUntilTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTakeWhileTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableThrottleFirstTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableThrottleLatestTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeIntervalTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeoutTests.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimeoutWithSelectorTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimerTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableTimestampTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToFutureTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToListTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToMapTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToMultimapTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToSortedListTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableToXTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableUnsubscribeOnTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableUsingTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowWithObservableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowWithSizeTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWindowWithTimeTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableWithLatestFromTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableZipCompletionTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableZipIterableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/observable/ObservableZipTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleAmbTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleCacheTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleConcatPublisherTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleConcatTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleContainstTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleCreateTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDeferTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDelayTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDematerializeTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDetachTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoAfterSuccessTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoAfterTerminateTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoFinallyTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnTerminateTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleDoOnTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleEqualsTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleErrorTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapCompletableTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapIterableFlowableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapIterableObservableTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapMaybeTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFlatMapTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromCallableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromPublisherTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromSupplierTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleFromTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleHideTest.java (81%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleInternalHelperTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleLiftTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMapTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMaterializeTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMergeTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleMiscTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleObserveOnTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleOnErrorXTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleSubscribeOnTest.java (80%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTakeUntilTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTimeoutTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleTimerTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleToFlowableTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleToObservableTest.java (82%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleUnsubscribeOnTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleUsingTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleZipArrayTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleZipIterableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/operators/single/SingleZipTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/queue/SimpleQueueTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/AbstractDirectTaskTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/ComputationSchedulerInternalTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/DisposeOnCancelTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/ImmediateThinSchedulerTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/InstantPeriodicTaskTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/RxThreadFactoryTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/ScheduledDirectPeriodicTaskTest.java (83%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/ScheduledRunnableTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerMultiWorkerSupportTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerPoolFactoryTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/SchedulerWhenTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/SingleSchedulerTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/schedulers/TrampolineSchedulerInternalTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/BasicFuseableConditionalSubscriberTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/BasicFuseableSubscriberTest.java (81%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/BlockingSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/BoundedSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/DeferredScalarSubscriberTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/EmptyComponentTest.java (79%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/FutureSubscriberTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/InnerQueuedSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/LambdaSubscriberTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/QueueDrainSubscriberTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/SinglePostCompleteSubscriberTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/StrictSubscriberTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscribers/SubscriberResourceWrapperTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/ArrayCompositeSubscriptionTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/AsyncSubscriptionTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/DeferredScalarSubscriptionTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/QueueSubscriptionTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/ScalarSubscriptionTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/SubscriptionArbiterTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/subscriptions/SubscriptionHelperTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/AtomicThrowableTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/BackpressureHelperTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/BlockingHelperTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/CrashingIterable.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/CrashingMappedIterable.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/EndConsumerHelperTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/ExceptionHelperTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/HalfSerializerObserverTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/HalfSerializerSubscriberTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/MergerBiFunctionTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/MiscUtilTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/NotificationLiteTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/ObservableToFlowabeTestSync.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/OpenHashSetTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/QueueDrainHelperTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/TestingHelper.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/internal/util/VolatileSizeArrayListTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/maybe/MaybeCreateTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/maybe/MaybeRetryTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/maybe/MaybeTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/maybe/MaybeTimerTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableCombineLatestTests.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableConcatTests.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableCovarianceTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableDoOnTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableErrorHandlingTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableEventStream.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableFuseableTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableGroupByTests.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableMergeTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableNullTests.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableReduceTests.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableScanTests.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableStartWithTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableThrottleLastTests.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableThrottleWithTimeoutTests.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableWindowTests.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/observable/ObservableZipTests.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/DisposableCompletableObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/DisposableMaybeObserverTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/DisposableObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/DisposableSingleObserverTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/ResourceCompletableObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/ResourceMaybeObserverTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/ResourceObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/ResourceSingleObserverTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/SafeObserverTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/SerializedObserverTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/observers/TestObserverTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelCollectTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelDoOnNextTryTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelFilterTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelFilterTryTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelFlowableTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelFromPublisherTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelInvalid.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelJoinTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelMapTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelMapTryTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelPeekTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelReduceFullTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelReduceTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelRunOnTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/parallel/ParallelSortedJoinTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/plugins/RxJavaPluginsTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/AsyncProcessorTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/BehaviorProcessorTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/FlowableProcessorTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/MulticastProcessorTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/PublishProcessorTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/ReplayProcessorBoundedConcurrencyTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/ReplayProcessorConcurrencyTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/ReplayProcessorTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/SerializedProcessorTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/processors/UnicastProcessorTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/AbstractSchedulerConcurrencyTests.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/AbstractSchedulerTests.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/CachedThreadSchedulerTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/ComputationSchedulerTests.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/ExecutorSchedulerInterruptibleTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/ExecutorSchedulerTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/FailOnBlockingTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/NewThreadSchedulerTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/SchedulerLifecycleTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/SchedulerTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/SchedulerTestHelper.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/SchedulerWorkerTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/TestSchedulerTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/TimedTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/schedulers/TrampolineSchedulerTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleCacheTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleNullTests.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleRetryTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleSubscribeTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/single/SingleTimerTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/AsyncSubjectTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/BehaviorSubjectTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/CompletableSubjectTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/MaybeSubjectTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/PublishSubjectTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/ReplaySubjectBoundedConcurrencyTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/ReplaySubjectConcurrencyTest.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/ReplaySubjectTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/SerializedSubjectTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/SingleSubjectTest.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/SubjectTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/subjects/UnicastSubjectTest.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/DefaultSubscriberTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/DisposableSubscriberTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/ResourceSubscriberTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/SafeSubscriberTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/SerializedSubscriberTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/subscribers/TestSubscriberTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/AllTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/AmbArrayTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/AmbTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/AnyTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/AsyncProcessorAsPublisherTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/BaseTck.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/BehaviorProcessorAsPublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/BufferBoundaryTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/BufferExactSizeTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CacheTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CollectTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CombineLatestArrayDelayErrorTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CombineLatestArrayTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CombineLatestIterableDelayErrorTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CombineLatestIterableTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CompletableAndThenPublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatArrayEagerTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatIterableEagerTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatMapIterableTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatMapMaybeTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatMapSingleTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatMapTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatPublisherEagerTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatPublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatWithCompletableTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatWithMaybeEmptyTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatWithMaybeTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ConcatWithSingleTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/CreateTckTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DefaultIfEmptyTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DeferTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DelaySubscriptionTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DelayTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DistinctTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DistinctUntilChangedTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DoAfterNextTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DoFinallyTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/DoOnNextTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ElementAtTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/EmptyTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FilterTckTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FirstTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FlatMapTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FromArrayTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FromCallableTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FromFutureTckTest.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FromIterableTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/FromSupplierTckTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/GenerateTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/GroupByTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/HideTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/IgnoreElementsTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/IntervalRangeTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/IntervalTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/IsEmptyTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/JustTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/LastTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/LimitTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MapTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MaybeFlatMapPublisherTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeIterableTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergePublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeWithCompletableTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeWithMaybeEmptyTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeWithMaybeTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MergeWithSingleTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MulticastProcessorAsPublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MulticastProcessorRefCountedTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/MulticastProcessorTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ObserveOnTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/OnBackpressureBufferTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/OnErrorResumeWithTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/OnErrorReturnItemTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/PublishProcessorAsPublisherTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/PublishSelectorTckTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/PublishTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/RangeTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/RebatchRequestsTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReduceTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReduceWithTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/RefCountProcessor.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/RepeatTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReplayProcessorUnboundedAsPublisherTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReplaySelectorTckTest.java (84%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ReplayTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/RetryTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ScanTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SequenceEqualTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ShareTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SingleFlatMapFlowableTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SingleTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SkipLastTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SkipTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SkipUntilTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SkipWhileTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SortedTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SubscribeOnTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SwitchIfEmptyTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SwitchMapDelayErrorTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SwitchMapTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/SwitchOnNextTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TakeLastTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TakeTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TakeUntilTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TakeWhileTckTest.java (87%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TimeIntervalTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TimeoutTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TimerTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/TimestampTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ToListTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ToMapTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ToMultimapTckTest.java (89%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ToSortedListTckTest.java (93%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/UnicastProcessorAsPublisherTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/UnicastProcessorTckTest.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/UnsubscribeOnTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/UsingTckTest.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/WindowBoundaryTckTest.java (86%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/WindowExactSizeTckTest.java (85%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/WithLatestFromTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ZipIterableTckTest.java (91%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ZipTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ZipWithIterableTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/tck/ZipWithTckTest.java (90%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/BaseTestConsumerEx.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TestHelper.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TestObserverEx.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TestObserverExTest.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TestSubscriberEx.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TestSubscriberExTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/testsupport/TimesteppingScheduler.java (92%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/BaseTypeAnnotations.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/BaseTypeParser.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/CheckLocalVariablesInTests.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/FixLicenseHeaders.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/InternalWrongNaming.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/JavadocFindUnescapedAngleBrackets.java (96%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/JavadocForAnnotations.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/JavadocWording.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/MaybeNo2Dot0Since.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/NewLinesBeforeAnnotation.java (97%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/NoAnonymousInnerClassesTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/OperatorsAreFinal.java (88%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/ParamValidationCheckerTest.java (99%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/PublicFinalMethods.java (95%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/TestPrefixInMethodName.java (94%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/TextualAorAn.java (98%) rename src/test/java/io/reactivex/{ => rxjava3}/validators/TooManyEmptyNewLines.java (96%) diff --git a/.gitignore b/.gitignore index 329bbb7e01..428d55b2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ bin/ # PMD files .pmd .ruleset +test-output/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8aa008b8fe..13c51c3564 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ targetCompatibility = JavaVersion.VERSION_1_6 // --------------------------------------- def junitVersion = "4.12" -def reactiveStreamsVersion = "1.0.2" +def reactiveStreamsVersion = "1.0.3-RC1" def mockitoVersion = "2.1.0" def jmhLibVersion = "1.20" def testNgVersion = "6.11" diff --git a/src/jmh/java/io/reactivex/BinaryFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java similarity index 99% rename from src/jmh/java/io/reactivex/BinaryFlatMapPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java index 45b4ee19ae..6d5bb44b23 100644 --- a/src/jmh/java/io/reactivex/BinaryFlatMapPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.TimeUnit; @@ -20,8 +20,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.Observable; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/BlockingGetPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java similarity index 98% rename from src/jmh/java/io/reactivex/BlockingGetPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java index e9b2fb1bbe..f40a8ca55b 100644 --- a/src/jmh/java/io/reactivex/BlockingGetPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; diff --git a/src/jmh/java/io/reactivex/BlockingPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java similarity index 98% rename from src/jmh/java/io/reactivex/BlockingPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java index a45ff394a9..020befc21a 100644 --- a/src/jmh/java/io/reactivex/BlockingPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/src/jmh/java/io/reactivex/CallableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java similarity index 97% rename from src/jmh/java/io/reactivex/CallableAsyncPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java index a492875a06..4afa54ecc8 100644 --- a/src/jmh/java/io/reactivex/CallableAsyncPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.*; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.internal.schedulers.SingleScheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.internal.schedulers.SingleScheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/EachTypeFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java similarity index 97% rename from src/jmh/java/io/reactivex/EachTypeFlatMapPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java index 7d150960c0..e05921c531 100644 --- a/src/jmh/java/io/reactivex/EachTypeFlatMapPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlatMapJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java similarity index 96% rename from src/jmh/java/io/reactivex/FlatMapJustPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java index 08b6b69c9e..8541f92834 100644 --- a/src/jmh/java/io/reactivex/FlatMapJustPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlattenCrossMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/FlattenCrossMapPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java index 6b44c6fa65..cfc5a1af97 100644 --- a/src/jmh/java/io/reactivex/FlattenCrossMapPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import java.util.*; +import java.util.Arrays; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlattenJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java similarity index 96% rename from src/jmh/java/io/reactivex/FlattenJustPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java index a44b2ef220..bb2394a053 100644 --- a/src/jmh/java/io/reactivex/FlattenJustPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlattenRangePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java similarity index 94% rename from src/jmh/java/io/reactivex/FlattenRangePerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java index 1d2fe51546..663fd8cdde 100644 --- a/src/jmh/java/io/reactivex/FlattenRangePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import java.util.*; +import java.util.Arrays; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlowableFlatMapCompletableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java similarity index 92% rename from src/jmh/java/io/reactivex/FlowableFlatMapCompletableAsyncPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java index 6dd4dcd263..83f2d4c4f4 100644 --- a/src/jmh/java/io/reactivex/FlowableFlatMapCompletableAsyncPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,9 +19,9 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.Action; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/FlowableFlatMapCompletableSyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/FlowableFlatMapCompletableSyncPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java index 047bad30a3..34f53a954a 100644 --- a/src/jmh/java/io/reactivex/FlowableFlatMapCompletableSyncPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.internal.functions.Functions; +import io.reactivex.rxjava3.internal.functions.Functions; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/InputWithIncrementingInteger.java b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java similarity index 94% rename from src/jmh/java/io/reactivex/InputWithIncrementingInteger.java rename to src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java index b5ce98e407..b0212f52d7 100644 --- a/src/jmh/java/io/reactivex/InputWithIncrementingInteger.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Iterator; @@ -19,8 +19,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.*; -import io.reactivex.internal.subscriptions.EmptySubscription; -import io.reactivex.subscribers.DefaultSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.subscribers.DefaultSubscriber; /** * Exposes an Observable and Observer that increments n Integers and consumes them in a Blackhole. diff --git a/src/jmh/java/io/reactivex/JustAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java similarity index 97% rename from src/jmh/java/io/reactivex/JustAsyncPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java index 1e2e363142..d22c1699e5 100644 --- a/src/jmh/java/io/reactivex/JustAsyncPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.internal.schedulers.SingleScheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.internal.schedulers.SingleScheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/LatchedSingleObserver.java b/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java similarity index 93% rename from src/jmh/java/io/reactivex/LatchedSingleObserver.java rename to src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java index 59b980a0eb..1b908ac6b2 100644 --- a/src/jmh/java/io/reactivex/LatchedSingleObserver.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.CountDownLatch; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; public final class LatchedSingleObserver implements SingleObserver { final CountDownLatch cdl; diff --git a/src/jmh/java/io/reactivex/MemoryPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java similarity index 72% rename from src/jmh/java/io/reactivex/MemoryPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java index 2a625c2149..7679ec5346 100644 --- a/src/jmh/java/io/reactivex/MemoryPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.lang.management.ManagementFactory; import java.util.concurrent.Callable; import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; /** * Measure various prepared flows about their memory usage and print the result @@ -58,8 +58,8 @@ public void onNext(Object t) { } } - static final class MyRx2Observer implements io.reactivex.Observer, io.reactivex.SingleObserver, - io.reactivex.MaybeObserver, io.reactivex.CompletableObserver { + static final class MyRx2Observer implements io.reactivex.rxjava3.core.Observer, io.reactivex.rxjava3.core.SingleObserver, + io.reactivex.rxjava3.core.MaybeObserver, io.reactivex.rxjava3.core.CompletableObserver { Disposable upstream; @@ -144,28 +144,28 @@ public static void main(String[] args) throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.just(1); + return io.reactivex.rxjava3.core.Observable.just(1); } }, "just", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10); + return io.reactivex.rxjava3.core.Observable.range(1, 10); } }, "range", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.empty(); + return io.reactivex.rxjava3.core.Observable.empty(); } }, "empty", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.fromCallable(new Callable() { + return io.reactivex.rxjava3.core.Observable.fromCallable(new Callable() { @Override public Object call() throws Exception { return 1; @@ -184,28 +184,28 @@ public Object call() throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return new io.reactivex.observers.TestObserver(); + return new io.reactivex.rxjava3.observers.TestObserver(); } }, "test-consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.just(1).subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.core.Observable.just(1).subscribeWith(new MyRx2Observer()); } }, "just+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeWith(new MyRx2Observer()); } }, "range+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).map(new Function() { + return io.reactivex.rxjava3.core.Observable.range(1, 10).map(new Function() { @Override public Object apply(Integer v) throws Exception { return v; @@ -217,7 +217,7 @@ public Object apply(Integer v) throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).map(new Function() { + return io.reactivex.rxjava3.core.Observable.range(1, 10).map(new Function() { @Override public Object apply(Integer v) throws Exception { return v; @@ -234,91 +234,91 @@ public boolean test(Object v) throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).subscribeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); } }, "range+subscribeOn+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).observeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.core.Observable.range(1, 10).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); } }, "range+observeOn+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Observable.range(1, 10).subscribeOn(io.reactivex.schedulers.Schedulers.computation()).observeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer()); } }, "range+subscribeOn+observeOn+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.AsyncSubject.create(); + return io.reactivex.rxjava3.subjects.AsyncSubject.create(); } }, "Async", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.PublishSubject.create(); + return io.reactivex.rxjava3.subjects.PublishSubject.create(); } }, "Publish", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.ReplaySubject.create(); + return io.reactivex.rxjava3.subjects.ReplaySubject.create(); } }, "Replay", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.BehaviorSubject.create(); + return io.reactivex.rxjava3.subjects.BehaviorSubject.create(); } }, "Behavior", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.UnicastSubject.create(); + return io.reactivex.rxjava3.subjects.UnicastSubject.create(); } }, "Unicast", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.AsyncSubject.create().subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.subjects.AsyncSubject.create().subscribeWith(new MyRx2Observer()); } }, "Async+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.PublishSubject.create().subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.subjects.PublishSubject.create().subscribeWith(new MyRx2Observer()); } }, "Publish+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.ReplaySubject.create().subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.subjects.ReplaySubject.create().subscribeWith(new MyRx2Observer()); } }, "Replay+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.BehaviorSubject.create().subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.subjects.BehaviorSubject.create().subscribeWith(new MyRx2Observer()); } }, "Behavior+consumer", "Rx2Observable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.subjects.UnicastSubject.create().subscribeWith(new MyRx2Observer()); + return io.reactivex.rxjava3.subjects.UnicastSubject.create().subscribeWith(new MyRx2Observer()); } }, "Unicast+consumer", "Rx2Observable"); @@ -327,35 +327,35 @@ public Object call() throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.just(1); + return io.reactivex.rxjava3.core.Flowable.just(1); } }, "just", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10); + return io.reactivex.rxjava3.core.Flowable.range(1, 10); } }, "range", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.empty(); + return io.reactivex.rxjava3.core.Flowable.empty(); } }, "empty", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.empty(); + return io.reactivex.rxjava3.core.Flowable.empty(); } }, "empty", "Rx2Flowable", 10000000); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.fromCallable(new Callable() { + return io.reactivex.rxjava3.core.Flowable.fromCallable(new Callable() { @Override public Object call() throws Exception { return 1; @@ -374,28 +374,28 @@ public Object call() throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return new io.reactivex.observers.TestObserver(); + return new io.reactivex.rxjava3.observers.TestObserver(); } }, "test-consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.just(1).subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.core.Flowable.just(1).subscribeWith(new MyRx2Subscriber()); } }, "just+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeWith(new MyRx2Subscriber()); } }, "range+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).map(new Function() { + return io.reactivex.rxjava3.core.Flowable.range(1, 10).map(new Function() { @Override public Object apply(Integer v) throws Exception { return v; @@ -407,7 +407,7 @@ public Object apply(Integer v) throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).map(new Function() { + return io.reactivex.rxjava3.core.Flowable.range(1, 10).map(new Function() { @Override public Object apply(Integer v) throws Exception { return v; @@ -424,91 +424,91 @@ public boolean test(Object v) throws Exception { checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).subscribeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); } }, "range+subscribeOn+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).observeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.core.Flowable.range(1, 10).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); } }, "range+observeOn+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.Flowable.range(1, 10).subscribeOn(io.reactivex.schedulers.Schedulers.computation()).observeOn(io.reactivex.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber()); } }, "range+subscribeOn+observeOn+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.AsyncProcessor.create(); + return io.reactivex.rxjava3.processors.AsyncProcessor.create(); } }, "Async", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.PublishProcessor.create(); + return io.reactivex.rxjava3.processors.PublishProcessor.create(); } }, "Publish", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.ReplayProcessor.create(); + return io.reactivex.rxjava3.processors.ReplayProcessor.create(); } }, "Replay", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.BehaviorProcessor.create(); + return io.reactivex.rxjava3.processors.BehaviorProcessor.create(); } }, "Behavior", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.UnicastProcessor.create(); + return io.reactivex.rxjava3.processors.UnicastProcessor.create(); } }, "Unicast", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.AsyncProcessor.create().subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.processors.AsyncProcessor.create().subscribeWith(new MyRx2Subscriber()); } }, "Async+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.PublishProcessor.create().subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.processors.PublishProcessor.create().subscribeWith(new MyRx2Subscriber()); } }, "Publish+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.ReplayProcessor.create().subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.processors.ReplayProcessor.create().subscribeWith(new MyRx2Subscriber()); } }, "Replay+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.BehaviorProcessor.create().subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.processors.BehaviorProcessor.create().subscribeWith(new MyRx2Subscriber()); } }, "Behavior+consumer", "Rx2Flowable"); checkMemory(new Callable() { @Override public Object call() throws Exception { - return io.reactivex.processors.UnicastProcessor.create().subscribeWith(new MyRx2Subscriber()); + return io.reactivex.rxjava3.processors.UnicastProcessor.create().subscribeWith(new MyRx2Subscriber()); } }, "Unicast+consumer", "Rx2Flowable"); diff --git a/src/jmh/java/io/reactivex/ObservableFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/ObservableFlatMapPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java index 02aabcb01d..d0d75e78d4 100644 --- a/src/jmh/java/io/reactivex/ObservableFlatMapPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/OperatorFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/OperatorFlatMapPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java index c1f0ddc11a..621894bd74 100644 --- a/src/jmh/java/io/reactivex/OperatorFlatMapPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java @@ -11,16 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/src/jmh/java/io/reactivex/OperatorMergePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java similarity index 97% rename from src/jmh/java/io/reactivex/OperatorMergePerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java index 97006c163a..7d68316c83 100644 --- a/src/jmh/java/io/reactivex/OperatorMergePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.TimeUnit; @@ -19,9 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/src/jmh/java/io/reactivex/PerfAsyncConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java similarity index 92% rename from src/jmh/java/io/reactivex/PerfAsyncConsumer.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java index 0b99202afc..7c222fddab 100644 --- a/src/jmh/java/io/reactivex/PerfAsyncConsumer.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import java.util.concurrent.*; +import java.util.concurrent.CountDownLatch; import org.openjdk.jmh.infra.Blackhole; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A multi-type asynchronous consumer. diff --git a/src/jmh/java/io/reactivex/PerfBoundedSubscriber.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java similarity index 97% rename from src/jmh/java/io/reactivex/PerfBoundedSubscriber.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java index 39cc6f551b..8ec19a833a 100644 --- a/src/jmh/java/io/reactivex/PerfBoundedSubscriber.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.CountDownLatch; diff --git a/src/jmh/java/io/reactivex/PerfConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java similarity index 94% rename from src/jmh/java/io/reactivex/PerfConsumer.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java index a25ec1f0a2..6025438218 100644 --- a/src/jmh/java/io/reactivex/PerfConsumer.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A multi-type synchronous consumer. diff --git a/src/jmh/java/io/reactivex/PerfInteropConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java similarity index 94% rename from src/jmh/java/io/reactivex/PerfInteropConsumer.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java index 2ec7b801a5..6dfbac7a31 100644 --- a/src/jmh/java/io/reactivex/PerfInteropConsumer.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A multi-type synchronous consumer that doesn't implement FlowableSubscriber and diff --git a/src/jmh/java/io/reactivex/PerfObserver.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java similarity index 93% rename from src/jmh/java/io/reactivex/PerfObserver.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java index 8de241e6a0..5f09b97ffe 100644 --- a/src/jmh/java/io/reactivex/PerfObserver.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.CountDownLatch; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; public final class PerfObserver implements Observer { final CountDownLatch cdl; diff --git a/src/jmh/java/io/reactivex/PerfSubscriber.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java similarity index 97% rename from src/jmh/java/io/reactivex/PerfSubscriber.java rename to src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java index 6e9a5cfde0..e4c52b5040 100644 --- a/src/jmh/java/io/reactivex/PerfSubscriber.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.CountDownLatch; diff --git a/src/jmh/java/io/reactivex/PublishProcessorPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java similarity index 94% rename from src/jmh/java/io/reactivex/PublishProcessorPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java index d9531ab267..c64e1f794d 100644 --- a/src/jmh/java/io/reactivex/PublishProcessorPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.subjects.PublishSubject; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/RangePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java similarity index 93% rename from src/jmh/java/io/reactivex/RangePerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java index 01294d97bb..c9723b086d 100644 --- a/src/jmh/java/io/reactivex/RangePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java @@ -11,16 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.Flowable; -import io.reactivex.internal.schedulers.SingleScheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.internal.schedulers.SingleScheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/ReducePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java similarity index 96% rename from src/jmh/java/io/reactivex/ReducePerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java index 9fd6da44dd..0282aa31e5 100644 --- a/src/jmh/java/io/reactivex/ReducePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.functions.BiFunction; +import io.reactivex.rxjava3.functions.BiFunction; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/RxVsStreamPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java similarity index 97% rename from src/jmh/java/io/reactivex/RxVsStreamPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java index d25896674a..74c8952c7a 100644 --- a/src/jmh/java/io/reactivex/RxVsStreamPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.List; import java.util.concurrent.TimeUnit; @@ -20,7 +20,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/StrictPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java similarity index 98% rename from src/jmh/java/io/reactivex/StrictPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java index aaba2d2107..59d17f4d60 100644 --- a/src/jmh/java/io/reactivex/StrictPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/src/jmh/java/io/reactivex/TakeUntilPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java similarity index 93% rename from src/jmh/java/io/reactivex/TakeUntilPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java index b27afa407e..71161b32d3 100644 --- a/src/jmh/java/io/reactivex/TakeUntilPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.*; import org.openjdk.jmh.annotations.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/ToFlowablePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java similarity index 97% rename from src/jmh/java/io/reactivex/ToFlowablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java index deb97a7e51..28b1d050fc 100644 --- a/src/jmh/java/io/reactivex/ToFlowablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,7 +19,7 @@ import org.openjdk.jmh.annotations.*; import org.reactivestreams.Publisher; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.*; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/XMapYPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java similarity index 99% rename from src/jmh/java/io/reactivex/XMapYPerf.java rename to src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java index d9e198b284..582d9da8dc 100644 --- a/src/jmh/java/io/reactivex/XMapYPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.TimeUnit; @@ -20,7 +20,7 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/parallel/ParallelPerf.java b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java similarity index 93% rename from src/jmh/java/io/reactivex/parallel/ParallelPerf.java rename to src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java index 24a0e85954..31d0ecc8c5 100644 --- a/src/jmh/java/io/reactivex/parallel/ParallelPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.parallel; +package io.reactivex.rxjava3.parallel; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,10 +20,10 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.flowables.GroupedFlowable; -import io.reactivex.functions.Function; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.flowables.GroupedFlowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.schedulers.Schedulers; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableConcatMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java index ab23c7e252..cb58173206 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java index b439425bd0..1aff189e56 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java index 7f891292d2..38ca515171 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableConcatMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java index 69f0b314fe..04148d7a47 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableConcatMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableFlatMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java index 4b9f37664a..e605629a8d 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java index bf2ad4396e..23bd80fe6b 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java index 37c970d6cc..bbbc96fc03 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableFlatMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java index e4405932f8..8407a60e6a 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableFlatMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java index d0c3041101..25b4e34529 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java index 217d7bdeba..ff6d5999ba 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java index f00690b313..87071d1108 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java index ad5b3209f0..a633856881 100644 --- a/src/jmh/java/io/reactivex/xmapz/FlowableSwitchMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -20,8 +20,8 @@ import org.openjdk.jmh.infra.Blackhole; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableConcatMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java index 18382f6d55..5b2b9247fc 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java index bc5752eeff..0ffbfcd321 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java index e85e2708e4..2ec317234b 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableConcatMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java index 090e1fde96..e67138c816 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableConcatMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableFlatMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java index 10bbed676e..6fc1ed9b07 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java index 021ae89332..d1b8dea70a 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java index 2c1eaccb00..37bf095ce5 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableFlatMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java index 46cd554792..6139e6e080 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableFlatMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapCompletablePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java index 7b1b9e6925..7f91a83adf 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapCompletablePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybeEmptyPerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java index 77657c69cb..967a244b07 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybeEmptyPerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java index 5e80b84e36..123e88b921 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapMaybePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java similarity index 95% rename from src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapSinglePerf.java rename to src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java index fcca79aa8b..abe4ea45b3 100644 --- a/src/jmh/java/io/reactivex/xmapz/ObservableSwitchMapSinglePerf.java +++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.xmapz; +package io.reactivex.rxjava3.xmapz; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -19,8 +19,8 @@ import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -import io.reactivex.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 5) diff --git a/src/main/java/io/reactivex/parallel/package-info.java b/src/main/java/io/reactivex/parallel/package-info.java deleted file mode 100644 index e7ee2576eb..0000000000 --- a/src/main/java/io/reactivex/parallel/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2016-present, RxJava Contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Contains the base type {@link io.reactivex.parallel.ParallelFlowable}, - * a sub-DSL for working with {@link io.reactivex.Flowable} sequences in parallel. - */ -package io.reactivex.parallel; \ No newline at end of file diff --git a/src/main/java/io/reactivex/annotations/BackpressureKind.java b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java similarity index 97% rename from src/main/java/io/reactivex/annotations/BackpressureKind.java rename to src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java index 6f04d811f3..aa20e5f78e 100644 --- a/src/main/java/io/reactivex/annotations/BackpressureKind.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; /** * Enumeration for various kinds of backpressure support. diff --git a/src/main/java/io/reactivex/annotations/BackpressureSupport.java b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java similarity index 96% rename from src/main/java/io/reactivex/annotations/BackpressureSupport.java rename to src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java index 17b3351656..9deafa22f5 100644 --- a/src/main/java/io/reactivex/annotations/BackpressureSupport.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; import java.lang.annotation.*; diff --git a/src/main/java/io/reactivex/annotations/Beta.java b/src/main/java/io/reactivex/rxjava3/annotations/Beta.java similarity index 94% rename from src/main/java/io/reactivex/annotations/Beta.java rename to src/main/java/io/reactivex/rxjava3/annotations/Beta.java index dea9484160..123842b773 100644 --- a/src/main/java/io/reactivex/annotations/Beta.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/Beta.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; /** * Indicates the feature is in beta state: it will be most likely stay but diff --git a/src/main/java/io/reactivex/annotations/CheckReturnValue.java b/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java similarity index 78% rename from src/main/java/io/reactivex/annotations/CheckReturnValue.java rename to src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java index 005f079693..3091d2647f 100644 --- a/src/main/java/io/reactivex/annotations/CheckReturnValue.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java @@ -11,13 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Marks methods whose return values should be checked. diff --git a/src/main/java/io/reactivex/annotations/Experimental.java b/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java similarity index 95% rename from src/main/java/io/reactivex/annotations/Experimental.java rename to src/main/java/io/reactivex/rxjava3/annotations/Experimental.java index b5b27b184c..32d60e1442 100644 --- a/src/main/java/io/reactivex/annotations/Experimental.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; /** * Indicates the feature is in experimental state: its existence, signature or behavior diff --git a/src/main/java/io/reactivex/annotations/NonNull.java b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java similarity index 69% rename from src/main/java/io/reactivex/annotations/NonNull.java rename to src/main/java/io/reactivex/rxjava3/annotations/NonNull.java index adfe9ff98f..06f1d4ee8b 100644 --- a/src/main/java/io/reactivex/annotations/NonNull.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java @@ -11,18 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.LOCAL_VARIABLE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.CLASS; +import java.lang.annotation.*; + /** * Indicates that a field/parameter/variable/return type is never null. */ diff --git a/src/main/java/io/reactivex/annotations/Nullable.java b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java similarity index 69% rename from src/main/java/io/reactivex/annotations/Nullable.java rename to src/main/java/io/reactivex/rxjava3/annotations/Nullable.java index 69e03498e7..c94cef974b 100644 --- a/src/main/java/io/reactivex/annotations/Nullable.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java @@ -11,18 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.LOCAL_VARIABLE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.CLASS; +import java.lang.annotation.*; + /** * Indicates that a field/parameter/variable/return type may be null. */ diff --git a/src/main/java/io/reactivex/annotations/SchedulerSupport.java b/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java similarity index 96% rename from src/main/java/io/reactivex/annotations/SchedulerSupport.java rename to src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java index 09acaa6dea..53b395f06b 100644 --- a/src/main/java/io/reactivex/annotations/SchedulerSupport.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; import java.lang.annotation.*; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Indicates what kind of scheduler the class or method uses. diff --git a/src/main/java/io/reactivex/annotations/package-info.java b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java similarity index 94% rename from src/main/java/io/reactivex/annotations/package-info.java rename to src/main/java/io/reactivex/rxjava3/annotations/package-info.java index 6883df9710..1f84d214c7 100644 --- a/src/main/java/io/reactivex/annotations/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java @@ -17,4 +17,4 @@ /** * Annotations for indicating experimental and beta operators, classes, methods, types or fields. */ -package io.reactivex.annotations; +package io.reactivex.rxjava3.annotations; diff --git a/src/main/java/io/reactivex/BackpressureOverflowStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java similarity index 96% rename from src/main/java/io/reactivex/BackpressureOverflowStrategy.java rename to src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java index b137bf2bae..5ee8ecca1d 100644 --- a/src/main/java/io/reactivex/BackpressureOverflowStrategy.java +++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; /** * Options to deal with buffer overflow when using onBackpressureBuffer. diff --git a/src/main/java/io/reactivex/BackpressureStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java similarity index 97% rename from src/main/java/io/reactivex/BackpressureStrategy.java rename to src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java index 1639ddcbd8..c0831d7759 100644 --- a/src/main/java/io/reactivex/BackpressureStrategy.java +++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; /** * Represents the options for applying backpressure to a source sequence. diff --git a/src/main/java/io/reactivex/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java similarity index 98% rename from src/main/java/io/reactivex/Completable.java rename to src/main/java/io/reactivex/rxjava3/core/Completable.java index 113be3b25f..06183c66db 100644 --- a/src/main/java/io/reactivex/Completable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java @@ -10,26 +10,26 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.concurrent.*; import org.reactivestreams.Publisher; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.*; -import io.reactivex.internal.operators.completable.*; -import io.reactivex.internal.operators.maybe.*; -import io.reactivex.internal.operators.mixed.*; -import io.reactivex.internal.operators.single.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.observers.*; +import io.reactivex.rxjava3.internal.operators.completable.*; +import io.reactivex.rxjava3.internal.operators.maybe.*; +import io.reactivex.rxjava3.internal.operators.mixed.*; +import io.reactivex.rxjava3.internal.operators.single.SingleDelayWithCompletable; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * The {@code Completable} class represents a deferred computation without any value but @@ -54,7 +54,7 @@ * Like an {@code Observable}, a {@code Completable} is lazy, can be either "hot" or "cold", synchronous or * asynchronous. {@code Completable} instances returned by the methods of this class are cold * and there is a standard hot implementation in the form of a subject: - * {@link io.reactivex.subjects.CompletableSubject CompletableSubject}. + * {@link io.reactivex.rxjava3.subjects.CompletableSubject CompletableSubject}. *

* The documentation for this class makes use of marble diagrams. The following legend explains these diagrams: *

@@ -94,12 +94,12 @@ * {@code void} return of the {@link #subscribe(CompletableObserver)} method) and it is the * responsibility of the implementor of the {@code CompletableObserver} to allow this to happen. * RxJava supports such usage with the standard - * {@link io.reactivex.observers.DisposableCompletableObserver DisposableCompletableObserver} instance. + * {@link io.reactivex.rxjava3.observers.DisposableCompletableObserver DisposableCompletableObserver} instance. * For convenience, the {@link #subscribeWith(CompletableObserver)} method is provided as well to * allow working with a {@code CompletableObserver} (or subclass) instance to be applied with in * a fluent manner (such as in the example above). * - * @see io.reactivex.observers.DisposableCompletableObserver + * @see io.reactivex.rxjava3.observers.DisposableCompletableObserver */ public abstract class Completable implements CompletableSource { /** @@ -417,7 +417,7 @@ public static Completable error(final Throwable error) { * delivered to the downstream via {@link CompletableObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Completable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @param run the runnable to run for each subscriber @@ -445,7 +445,7 @@ public static Completable fromAction(final Action run) { * delivered to the downstream via {@link CompletableObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Completable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @param callable the callable instance to execute for each subscriber @@ -520,7 +520,7 @@ public static Completable fromMaybe(final MaybeSource maybe) { * delivered to the downstream via {@link CompletableObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Completable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @param run the runnable to run for each subscriber @@ -630,7 +630,7 @@ public static Completable fromSingle(final SingleSource single) { * delivered to the downstream via {@link CompletableObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Completable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @param supplier the Supplier instance to execute for each subscriber @@ -2361,7 +2361,7 @@ public final Disposable subscribe(final Action onComplete, final Consumer *

* If the Completable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
diff --git a/src/main/java/io/reactivex/CompletableConverter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java similarity index 93% rename from src/main/java/io/reactivex/CompletableConverter.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java index b6f7c08a4e..6ef04e2608 100644 --- a/src/main/java/io/reactivex/CompletableConverter.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the {@link Completable#to} operator to turn a Completable into another diff --git a/src/main/java/io/reactivex/CompletableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java similarity index 91% rename from src/main/java/io/reactivex/CompletableEmitter.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java index ffbd9ba37b..51c9780f73 100644 --- a/src/main/java/io/reactivex/CompletableEmitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * Abstraction over an RxJava {@link CompletableObserver} that allows associating @@ -26,7 +26,7 @@ *

* Calling {@link #onComplete()} multiple times has no effect. * Calling {@link #onError(Throwable)} multiple times or after {@code onComplete} will route the - * exception into the global error handler via {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * exception into the global error handler via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. *

* The emitter allows the registration of a single resource, in the form of a {@link Disposable} * or {@link Cancellable} via {@link #setDisposable(Disposable)} or {@link #setCancellable(Cancellable)} @@ -36,14 +36,14 @@ *

* Only one {@code Disposable} or {@code Cancellable} object can be associated with the emitter at * a time. Calling either {@code set} method will dispose/cancel any previous object. If there - * is a need for handling multiple resources, one can create a {@link io.reactivex.disposables.CompositeDisposable} + * is a need for handling multiple resources, one can create a {@link io.reactivex.rxjava3.disposables.CompositeDisposable} * and associate that with the emitter instead. *

* The {@link Cancellable} is logically equivalent to {@code Disposable} but allows using cleanup logic that can * throw a checked exception (such as many {@code close()} methods on Java IO components). Since * the release of resources happens after the terminal events have been delivered or the sequence gets * cancelled, exceptions throw within {@code Cancellable} are routed to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. */ public interface CompletableEmitter { diff --git a/src/main/java/io/reactivex/CompletableObserver.java b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java similarity index 95% rename from src/main/java/io/reactivex/CompletableObserver.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java index eac7c9436b..af0a017d66 100644 --- a/src/main/java/io/reactivex/CompletableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.disposables.Disposable; /** * Provides a mechanism for receiving push-based notification of a valueless completion or an error. diff --git a/src/main/java/io/reactivex/CompletableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java similarity index 92% rename from src/main/java/io/reactivex/CompletableOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java index c0514c69d0..8dc2531997 100644 --- a/src/main/java/io/reactivex/CompletableOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that has a {@code subscribe()} method that receives diff --git a/src/main/java/io/reactivex/CompletableOperator.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java similarity index 92% rename from src/main/java/io/reactivex/CompletableOperator.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java index 749e41fa05..3a45c9085f 100644 --- a/src/main/java/io/reactivex/CompletableOperator.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to map/wrap a downstream observer to an upstream observer. diff --git a/src/main/java/io/reactivex/CompletableSource.java b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java similarity index 92% rename from src/main/java/io/reactivex/CompletableSource.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableSource.java index 145b0404f7..390be60b2e 100644 --- a/src/main/java/io/reactivex/CompletableSource.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents a basic {@link Completable} source base interface, diff --git a/src/main/java/io/reactivex/CompletableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java similarity index 92% rename from src/main/java/io/reactivex/CompletableTransformer.java rename to src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java index f6569916ef..b6acc252b0 100644 --- a/src/main/java/io/reactivex/CompletableTransformer.java +++ b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the compose operator to turn a Completable into another diff --git a/src/main/java/io/reactivex/Emitter.java b/src/main/java/io/reactivex/rxjava3/core/Emitter.java similarity index 94% rename from src/main/java/io/reactivex/Emitter.java rename to src/main/java/io/reactivex/rxjava3/core/Emitter.java index 0d95e80dcf..e222f9c44f 100644 --- a/src/main/java/io/reactivex/Emitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/Emitter.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * Base interface for emitting signals in a push-fashion in various generator-like source diff --git a/src/main/java/io/reactivex/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java similarity index 99% rename from src/main/java/io/reactivex/Flowable.java rename to src/main/java/io/reactivex/rxjava3/core/Flowable.java index 9f45a1a610..f16fa2cf03 100644 --- a/src/main/java/io/reactivex/Flowable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java @@ -10,30 +10,30 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.*; import org.reactivestreams.*; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.flowables.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.operators.flowable.*; -import io.reactivex.internal.operators.mixed.*; -import io.reactivex.internal.operators.observable.*; -import io.reactivex.internal.schedulers.ImmediateThinScheduler; -import io.reactivex.internal.subscribers.*; -import io.reactivex.internal.util.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.*; -import io.reactivex.subscribers.*; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.flowables.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.operators.flowable.*; +import io.reactivex.rxjava3.internal.operators.mixed.*; +import io.reactivex.rxjava3.internal.operators.observable.ObservableFromPublisher; +import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.*; +import io.reactivex.rxjava3.subscribers.*; /** * The Flowable class that implements the Reactive Streams @@ -147,7 +147,7 @@ * the type of the items emitted by the Flowable * @see Observable * @see ParallelFlowable - * @see io.reactivex.subscribers.DisposableSubscriber + * @see io.reactivex.rxjava3.subscribers.DisposableSubscriber */ public abstract class Flowable implements Publisher { /** The default buffer size. */ @@ -2082,7 +2082,7 @@ public static Flowable fromArray(T... items) { * delivered to the downstream via {@link Subscriber#onError(Throwable)}, * except when the downstream has canceled this {@code Flowable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * *

* @@ -2356,7 +2356,7 @@ public static Flowable fromPublisher(final Publisher source) * delivered to the downstream via {@link Subscriber#onError(Throwable)}, * except when the downstream has canceled this {@code Flowable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @@ -6115,7 +6115,7 @@ public final void blockingSubscribe() { * Subscribes to the source and calls the given callbacks on the current thread. *

* If the Flowable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)} * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended. @@ -6145,7 +6145,7 @@ public final void blockingSubscribe(Consumer onNext) { * Subscribes to the source and calls the given callbacks on the current thread. *

* If the Flowable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)} * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended. @@ -10494,7 +10494,7 @@ public final Disposable forEach(Consumer onNext) { * onNext Predicate returns false. *

* If the Flowable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Backpressure:
@@ -14801,7 +14801,7 @@ public final Flowable startWithArray(T... items) { * Subscribes to a Publisher and ignores {@code onNext} and {@code onComplete} emissions. *

* If the Flowable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Backpressure:
@@ -14825,7 +14825,7 @@ public final Disposable subscribe() { * Subscribes to a Publisher and provides a callback to handle the items it emits. *

* If the Flowable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Backpressure:
@@ -15235,7 +15235,7 @@ public final Flowable switchMap(Function Flowable switchMap0(Function> *
This operator terminates with an {@code onError} if this {@code Flowable} or any of * the inner {@code MaybeSource}s fail while they are active. When this happens concurrently, their * individual {@code Throwable} errors may get combined and emitted as a single - * {@link io.reactivex.exceptions.CompositeException CompositeException}. Otherwise, a late + * {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late * (i.e., inactive or switched out) {@code onError} from this {@code Flowable} or from any of * the inner {@code MaybeSource}s will be forwarded to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} as - * {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}
+ * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as + * {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException} *
*

History: 2.1.11 - experimental * @param the output value type @@ -15480,11 +15480,11 @@ public final Flowable switchMapMaybeDelayError(@NonNull FunctionThis operator terminates with an {@code onError} if this {@code Flowable} or any of * the inner {@code SingleSource}s fail while they are active. When this happens concurrently, their * individual {@code Throwable} errors may get combined and emitted as a single - * {@link io.reactivex.exceptions.CompositeException CompositeException}. Otherwise, a late + * {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late * (i.e., inactive or switched out) {@code onError} from this {@code Flowable} or from any of * the inner {@code SingleSource}s will be forwarded to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} as - * {@link io.reactivex.exceptions.UndeliverableException UndeliverableException} + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as + * {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException} *

*

History: 2.1.11 - experimental * @param the output value type @@ -16199,7 +16199,7 @@ public final Flowable throttleLast(long intervalDuration, TimeUnit unit, Sche *

Backpressure:
*
This operator does not support backpressure as it uses time to control data flow. * If the downstream is not ready to receive items, a - * {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} + * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} * will be signaled.
*
Scheduler:
*
{@code throttleLatest} operates by default on the {@code computation} {@link Scheduler}.
@@ -16233,7 +16233,7 @@ public final Flowable throttleLatest(long timeout, TimeUnit unit) { *
Backpressure:
*
This operator does not support backpressure as it uses time to control data flow. * If the downstream is not ready to receive items, a - * {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} + * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} * will be signaled.
*
Scheduler:
*
{@code throttleLatest} operates by default on the {@code computation} {@link Scheduler}.
@@ -16273,7 +16273,7 @@ public final Flowable throttleLatest(long timeout, TimeUnit unit, boolean emi *
Backpressure:
*
This operator does not support backpressure as it uses time to control data flow. * If the downstream is not ready to receive items, a - * {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} + * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} * will be signaled.
*
Scheduler:
*
You specify which {@link Scheduler} this operator will use.
@@ -16308,7 +16308,7 @@ public final Flowable throttleLatest(long timeout, TimeUnit unit, Scheduler s *
Backpressure:
*
This operator does not support backpressure as it uses time to control data flow. * If the downstream is not ready to receive items, a - * {@link io.reactivex.exceptions.MissingBackpressureException MissingBackpressureException} + * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException} * will be signaled.
*
Scheduler:
*
You specify which {@link Scheduler} this operator will use.
diff --git a/src/main/java/io/reactivex/FlowableConverter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java similarity index 93% rename from src/main/java/io/reactivex/FlowableConverter.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java index 60bc7cb1af..0736dc189d 100644 --- a/src/main/java/io/reactivex/FlowableConverter.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the {@link Flowable#to} operator to turn a Flowable into another diff --git a/src/main/java/io/reactivex/FlowableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java similarity index 93% rename from src/main/java/io/reactivex/FlowableEmitter.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java index 1cd91e14b4..8f66b7bbee 100644 --- a/src/main/java/io/reactivex/FlowableEmitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * Abstraction over a Reactive Streams {@link org.reactivestreams.Subscriber} that allows associating @@ -37,14 +37,14 @@ *

* Only one {@code Disposable} or {@code Cancellable} object can be associated with the emitter at * a time. Calling either {@code set} method will dispose/cancel any previous object. If there - * is a need for handling multiple resources, one can create a {@link io.reactivex.disposables.CompositeDisposable} + * is a need for handling multiple resources, one can create a {@link io.reactivex.rxjava3.disposables.CompositeDisposable} * and associate that with the emitter instead. *

* The {@link Cancellable} is logically equivalent to {@code Disposable} but allows using cleanup logic that can * throw a checked exception (such as many {@code close()} methods on Java IO components). Since * the release of resources happens after the terminal events have been delivered or the sequence gets * cancelled, exceptions throw within {@code Cancellable} are routed to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. * * @param the value type to emit */ diff --git a/src/main/java/io/reactivex/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java similarity index 93% rename from src/main/java/io/reactivex/FlowableOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java index 269311cc32..93d125de2f 100644 --- a/src/main/java/io/reactivex/FlowableOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that has a {@code subscribe()} method that receives diff --git a/src/main/java/io/reactivex/FlowableOperator.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java similarity index 93% rename from src/main/java/io/reactivex/FlowableOperator.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java index b81a0b6c7e..8ce0ab8f7d 100644 --- a/src/main/java/io/reactivex/FlowableOperator.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java @@ -11,11 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; import org.reactivestreams.Subscriber; +import io.reactivex.rxjava3.annotations.NonNull; + /** * Interface to map/wrap a downstream subscriber to an upstream subscriber. * diff --git a/src/main/java/io/reactivex/FlowableSubscriber.java b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java similarity index 94% rename from src/main/java/io/reactivex/FlowableSubscriber.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java index 2ef1019acf..3b0a80cf9a 100644 --- a/src/main/java/io/reactivex/FlowableSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java @@ -11,11 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; import org.reactivestreams.*; +import io.reactivex.rxjava3.annotations.NonNull; + /** * Represents a Reactive-Streams inspired Subscriber that is RxJava 2 only * and weakens rules §1.3 and §3.9 of the specification for gaining performance. diff --git a/src/main/java/io/reactivex/FlowableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java similarity index 93% rename from src/main/java/io/reactivex/FlowableTransformer.java rename to src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java index 78a0f43e9d..ecee751040 100644 --- a/src/main/java/io/reactivex/FlowableTransformer.java +++ b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java @@ -11,11 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; import org.reactivestreams.Publisher; +import io.reactivex.rxjava3.annotations.NonNull; + /** * Interface to compose Flowables. * diff --git a/src/main/java/io/reactivex/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java similarity index 99% rename from src/main/java/io/reactivex/Maybe.java rename to src/main/java/io/reactivex/rxjava3/core/Maybe.java index fb6d94ac9d..16df7fb908 100644 --- a/src/main/java/io/reactivex/Maybe.java +++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java @@ -11,27 +11,27 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.NoSuchElementException; import java.util.concurrent.*; import org.reactivestreams.*; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.BlockingMultiObserver; -import io.reactivex.internal.operators.flowable.*; -import io.reactivex.internal.operators.maybe.*; -import io.reactivex.internal.operators.mixed.*; -import io.reactivex.internal.util.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.observers.BlockingMultiObserver; +import io.reactivex.rxjava3.internal.operators.flowable.*; +import io.reactivex.rxjava3.internal.operators.maybe.*; +import io.reactivex.rxjava3.internal.operators.mixed.*; +import io.reactivex.rxjava3.internal.util.ErrorMode; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * The {@code Maybe} class represents a deferred computation and emission of a single value, no value at all or an exception. @@ -53,7 +53,7 @@ * Like an {@code Observable}, a {@code Maybe} is lazy, can be either "hot" or "cold", synchronous or * asynchronous. {@code Maybe} instances returned by the methods of this class are cold * and there is a standard hot implementation in the form of a subject: - * {@link io.reactivex.subjects.MaybeSubject MaybeSubject}. + * {@link io.reactivex.rxjava3.subjects.MaybeSubject MaybeSubject}. *

* The documentation for this class makes use of marble diagrams. The following legend explains these diagrams: *

@@ -98,14 +98,14 @@ * {@code void} return of the {@link #subscribe(MaybeObserver)} method) and it is the * responsibility of the implementor of the {@code MaybeObserver} to allow this to happen. * RxJava supports such usage with the standard - * {@link io.reactivex.observers.DisposableMaybeObserver DisposableMaybeObserver} instance. + * {@link io.reactivex.rxjava3.observers.DisposableMaybeObserver DisposableMaybeObserver} instance. * For convenience, the {@link #subscribeWith(MaybeObserver)} method is provided as well to * allow working with a {@code MaybeObserver} (or subclass) instance to be applied with in * a fluent manner (such as in the example above). * * @param the value type * @since 2.0 - * @see io.reactivex.observers.DisposableMaybeObserver + * @see io.reactivex.rxjava3.observers.DisposableMaybeObserver */ public abstract class Maybe implements MaybeSource { @@ -292,7 +292,7 @@ public static Flowable concat( *

Backpressure:
*
The returned {@code Flowable} honors the backpressure of the downstream consumer and * expects the {@code Publisher} to honor backpressure as well. If the sources {@code Publisher} - * violates this, a {@link io.reactivex.exceptions.MissingBackpressureException} is signalled.
+ * violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signalled. *
Scheduler:
*
{@code concat} does not operate by default on a particular {@link Scheduler}.
*
@@ -316,7 +316,7 @@ public static Flowable concat(PublisherBackpressure: *
The returned {@code Flowable} honors the backpressure of the downstream consumer and * expects the {@code Publisher} to honor backpressure as well. If the sources {@code Publisher} - * violates this, a {@link io.reactivex.exceptions.MissingBackpressureException} is signalled.
+ * violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signalled. *
Scheduler:
*
{@code concat} does not operate by default on a particular {@link Scheduler}.
* @@ -510,7 +510,7 @@ public static Flowable concatEager(IterableBackpressure: *
Backpressure is honored towards the downstream and the outer Publisher is * expected to support backpressure. Violating this assumption, the operator will - * signal {@link io.reactivex.exceptions.MissingBackpressureException}.
+ * signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}. *
Scheduler:
*
This method does not operate by default on a particular {@link Scheduler}.
* @@ -680,7 +680,7 @@ public static Maybe error(Supplier supplier) { * delivered to the downstream via {@link MaybeObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Maybe} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @param the target type @@ -747,7 +747,7 @@ public static Maybe fromSingle(SingleSource singleSource) { * {@code Callable} "lazily". *

* Note that the {@code null} handling of this operator differs from the similar source operators in the other - * {@link io.reactivex base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their + * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their * {@code Callable} is {@code null} while this {@code fromCallable} considers it to indicate the * returned {@code Maybe} is empty. *

@@ -757,8 +757,8 @@ public static Maybe fromSingle(SingleSource singleSource) { *
Any non-fatal exception thrown by {@link Callable#call()} will be forwarded to {@code onError}, * except if the {@code MaybeObserver} disposed the subscription in the meantime. In this latter case, * the exception is forwarded to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} wrapped into a - * {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} wrapped into a + * {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * Fatal exceptions are rethrown and usually will end up in the executing thread's * {@link java.lang.Thread.UncaughtExceptionHandler#uncaughtException(Thread, Throwable)} handler.
*
@@ -886,7 +886,7 @@ public static Maybe fromRunnable(final Runnable run) { * *

* Note that the {@code null} handling of this operator differs from the similar source operators in the other - * {@link io.reactivex base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their + * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their * {@code Supplier} is {@code null} while this {@code fromSupplier} considers it to indicate the * returned {@code Maybe} is empty. *

@@ -896,8 +896,8 @@ public static Maybe fromRunnable(final Runnable run) { *
Any non-fatal exception thrown by {@link Supplier#get()} will be forwarded to {@code onError}, * except if the {@code MaybeObserver} disposed the subscription in the meantime. In this latter case, * the exception is forwarded to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} wrapped into a - * {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} wrapped into a + * {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * Fatal exceptions are rethrown and usually will end up in the executing thread's * {@link java.lang.Thread.UncaughtExceptionHandler#uncaughtException(Thread, Throwable)} handler.
*
@@ -4184,7 +4184,7 @@ public final Maybe retryWhen( * Subscribes to a Maybe and ignores {@code onSuccess} and {@code onComplete} emissions. *

* If the Maybe emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
@@ -4204,7 +4204,7 @@ public final Disposable subscribe() { * Subscribes to a Maybe and provides a callback to handle the items it emits. *

* If the Maybe emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
diff --git a/src/main/java/io/reactivex/MaybeConverter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java similarity index 93% rename from src/main/java/io/reactivex/MaybeConverter.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java index fe830ef1d7..de70b81814 100644 --- a/src/main/java/io/reactivex/MaybeConverter.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the {@link Maybe#to} operator to turn a Maybe into another diff --git a/src/main/java/io/reactivex/MaybeEmitter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java similarity index 92% rename from src/main/java/io/reactivex/MaybeEmitter.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java index 4819ce3c3e..dfc8671073 100644 --- a/src/main/java/io/reactivex/MaybeEmitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * Abstraction over an RxJava {@link MaybeObserver} that allows associating @@ -26,7 +26,7 @@ *

* Calling {@link #onSuccess(Object)} or {@link #onComplete()} multiple times has no effect. * Calling {@link #onError(Throwable)} multiple times or after the other two will route the - * exception into the global error handler via {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * exception into the global error handler via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. *

* The emitter allows the registration of a single resource, in the form of a {@link Disposable} * or {@link Cancellable} via {@link #setDisposable(Disposable)} or {@link #setCancellable(Cancellable)} @@ -36,14 +36,14 @@ *

* Only one {@code Disposable} or {@code Cancellable} object can be associated with the emitter at * a time. Calling either {@code set} method will dispose/cancel any previous object. If there - * is a need for handling multiple resources, one can create a {@link io.reactivex.disposables.CompositeDisposable} + * is a need for handling multiple resources, one can create a {@link io.reactivex.rxjava3.disposables.CompositeDisposable} * and associate that with the emitter instead. *

* The {@link Cancellable} is logically equivalent to {@code Disposable} but allows using cleanup logic that can * throw a checked exception (such as many {@code close()} methods on Java IO components). Since * the release of resources happens after the terminal events have been delivered or the sequence gets * cancelled, exceptions throw within {@code Cancellable} are routed to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. * * @param the value type to emit */ diff --git a/src/main/java/io/reactivex/MaybeObserver.java b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java similarity index 96% rename from src/main/java/io/reactivex/MaybeObserver.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java index 76784484f1..7b7eb1a0d4 100644 --- a/src/main/java/io/reactivex/MaybeObserver.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.disposables.Disposable; /** * Provides a mechanism for receiving push-based notification of a single value, an error or completion without any value. diff --git a/src/main/java/io/reactivex/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java similarity index 93% rename from src/main/java/io/reactivex/MaybeOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java index 941cdc3d6c..dbccf870f9 100644 --- a/src/main/java/io/reactivex/MaybeOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that has a {@code subscribe()} method that receives diff --git a/src/main/java/io/reactivex/MaybeOperator.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java similarity index 93% rename from src/main/java/io/reactivex/MaybeOperator.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java index 9e7a54f122..b3173eb833 100644 --- a/src/main/java/io/reactivex/MaybeOperator.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to map/wrap a downstream observer to an upstream observer. diff --git a/src/main/java/io/reactivex/MaybeSource.java b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java similarity index 93% rename from src/main/java/io/reactivex/MaybeSource.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeSource.java index 4694eb0cef..dd037cc864 100644 --- a/src/main/java/io/reactivex/MaybeSource.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents a basic {@link Maybe} source base interface, diff --git a/src/main/java/io/reactivex/MaybeTransformer.java b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java similarity index 93% rename from src/main/java/io/reactivex/MaybeTransformer.java rename to src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java index 1526913b53..d53bfda71d 100644 --- a/src/main/java/io/reactivex/MaybeTransformer.java +++ b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to compose Maybes. diff --git a/src/main/java/io/reactivex/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java similarity index 96% rename from src/main/java/io/reactivex/Notification.java rename to src/main/java/io/reactivex/rxjava3/core/Notification.java index 84ceb38a88..23139896cb 100644 --- a/src/main/java/io/reactivex/Notification.java +++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.NotificationLite; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.NotificationLite; /** * Represents the reactive signal types: onNext, onError and onComplete and diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java similarity index 99% rename from src/main/java/io/reactivex/Observable.java rename to src/main/java/io/reactivex/rxjava3/core/Observable.java index 1af2119087..bcc013a10f 100644 --- a/src/main/java/io/reactivex/Observable.java +++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java @@ -11,28 +11,28 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.*; import java.util.concurrent.*; import org.reactivestreams.Publisher; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.observers.*; -import io.reactivex.internal.operators.flowable.*; -import io.reactivex.internal.operators.mixed.*; -import io.reactivex.internal.operators.observable.*; -import io.reactivex.internal.util.*; -import io.reactivex.observables.*; -import io.reactivex.observers.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.*; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.observers.*; +import io.reactivex.rxjava3.internal.operators.flowable.*; +import io.reactivex.rxjava3.internal.operators.mixed.*; +import io.reactivex.rxjava3.internal.operators.observable.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observables.*; +import io.reactivex.rxjava3.observers.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.*; /** * The Observable class is the non-backpressured, optionally multi-valued base reactive class that @@ -93,7 +93,7 @@ * @param * the type of the items emitted by the Observable * @see Flowable - * @see io.reactivex.observers.DisposableObserver + * @see io.reactivex.rxjava3.observers.DisposableObserver */ public abstract class Observable implements ObservableSource { @@ -1794,7 +1794,7 @@ public static Observable fromArray(T... items) { * delivered to the downstream via {@link Observer#onError(Throwable)}, * except when the downstream has disposed this {@code Observable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * *

* @param supplier @@ -2044,7 +2044,7 @@ public static Observable fromPublisher(Publisher publisher) * delivered to the downstream via {@link Observer#onError(Throwable)}, * except when the downstream has disposed this {@code Observable} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * *
* @param supplier @@ -5490,7 +5490,7 @@ public final void blockingSubscribe() { * *

* If the {@code Observable} emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)} * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended. @@ -9116,7 +9116,7 @@ public final Disposable forEach(Consumer onNext) { * *

* If the Observable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
@@ -9444,7 +9444,7 @@ public final Observable groupJoin( /** * Hides the identity of this Observable and its Disposable. - *

Allows hiding extra features such as {@link io.reactivex.subjects.Subject}'s + *

Allows hiding extra features such as {@link io.reactivex.rxjava3.subjects.Subject}'s * {@link Observer} methods or preventing certain identity-based * optimizations (fusion). *

@@ -12214,7 +12214,7 @@ public final Observable startWithArray(T... items) { * Subscribes to an ObservableSource and ignores {@code onNext} and {@code onComplete} emissions. *

* If the Observable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
@@ -12234,7 +12234,7 @@ public final Disposable subscribe() { * Subscribes to an ObservableSource and provides a callback to handle the items it emits. *

* If the Observable emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

*
Scheduler:
@@ -12518,7 +12518,7 @@ public final Observable switchMap(FunctionThis operator terminates with an {@code onError} if this {@code Observable} or any of * the inner {@code MaybeSource}s fail while they are active. When this happens concurrently, their * individual {@code Throwable} errors may get combined and emitted as a single - * {@link io.reactivex.exceptions.CompositeException CompositeException}. Otherwise, a late + * {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late * (i.e., inactive or switched out) {@code onError} from this {@code Observable} or from any of * the inner {@code MaybeSource}s will be forwarded to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} as - * {@link io.reactivex.exceptions.UndeliverableException UndeliverableException} + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as + * {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException} *
*

History: 2.1.11 - experimental * @param the output value type diff --git a/src/main/java/io/reactivex/ObservableConverter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java similarity index 93% rename from src/main/java/io/reactivex/ObservableConverter.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java index 2bdfec0b26..744c0ef48e 100644 --- a/src/main/java/io/reactivex/ObservableConverter.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the {@link Observable#to} operator to turn an Observable into another diff --git a/src/main/java/io/reactivex/ObservableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java similarity index 93% rename from src/main/java/io/reactivex/ObservableEmitter.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java index 9faccf528d..f4f7ef6bb0 100644 --- a/src/main/java/io/reactivex/ObservableEmitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * Abstraction over an RxJava {@link Observer} that allows associating @@ -36,14 +36,14 @@ *

* Only one {@code Disposable} or {@code Cancellable} object can be associated with the emitter at * a time. Calling either {@code set} method will dispose/cancel any previous object. If there - * is a need for handling multiple resources, one can create a {@link io.reactivex.disposables.CompositeDisposable} + * is a need for handling multiple resources, one can create a {@link io.reactivex.rxjava3.disposables.CompositeDisposable} * and associate that with the emitter instead. *

* The {@link Cancellable} is logically equivalent to {@code Disposable} but allows using cleanup logic that can * throw a checked exception (such as many {@code close()} methods on Java IO components). Since * the release of resources happens after the terminal events have been delivered or the sequence gets * cancelled, exceptions throw within {@code Cancellable} are routed to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. * * @param the value type to emit */ diff --git a/src/main/java/io/reactivex/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java similarity index 93% rename from src/main/java/io/reactivex/ObservableOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java index b2f58f3b11..1f98911285 100644 --- a/src/main/java/io/reactivex/ObservableOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that has a {@code subscribe()} method that receives diff --git a/src/main/java/io/reactivex/ObservableOperator.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java similarity index 93% rename from src/main/java/io/reactivex/ObservableOperator.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java index 18ec3ecef6..f7335b6221 100644 --- a/src/main/java/io/reactivex/ObservableOperator.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to map/wrap a downstream observer to an upstream observer. diff --git a/src/main/java/io/reactivex/ObservableSource.java b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java similarity index 92% rename from src/main/java/io/reactivex/ObservableSource.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableSource.java index ea0b16490b..a48011e438 100644 --- a/src/main/java/io/reactivex/ObservableSource.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents a basic, non-backpressured {@link Observable} source base interface, diff --git a/src/main/java/io/reactivex/ObservableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java similarity index 93% rename from src/main/java/io/reactivex/ObservableTransformer.java rename to src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java index a7f20eb965..63dc87ca8b 100644 --- a/src/main/java/io/reactivex/ObservableTransformer.java +++ b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to compose Observables. diff --git a/src/main/java/io/reactivex/Observer.java b/src/main/java/io/reactivex/rxjava3/core/Observer.java similarity index 94% rename from src/main/java/io/reactivex/Observer.java rename to src/main/java/io/reactivex/rxjava3/core/Observer.java index 4c446e67fb..ef95e18034 100644 --- a/src/main/java/io/reactivex/Observer.java +++ b/src/main/java/io/reactivex/rxjava3/core/Observer.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.disposables.Disposable; /** * Provides a mechanism for receiving push-based notifications. @@ -55,7 +55,7 @@ *

  • If the flow is synchronous, the {@link ObservableSource#subscribe(Observer)} throws instead of returning normally.
    • *
  • If the flow is asynchronous, the exception propagates up to the component ({@link Scheduler} or {@link java.util.concurrent.Executor}) * providing the asynchronous boundary the code is running and either routes the exception to the global - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} handler or the current thread's + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} handler or the current thread's * {@link java.lang.Thread.UncaughtExceptionHandler#uncaughtException(Thread, Throwable)} handler.
    • * * From the {@code Observable}'s perspective, an {@code Observer} is the end consumer thus it is the {@code Observer}'s @@ -68,7 +68,7 @@ *

    * If, for some reason, the {@code Observer} won't follow Rule 2.13, the {@link Observable#safeSubscribe(Observer)} can wrap it * with the necessary safeguards and route exceptions thrown from {@code onNext} into {@code onError} and route exceptions thrown - * from {@code onError} and {@code onComplete} into the global error handler via {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * from {@code onError} and {@code onComplete} into the global error handler via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. * @see ReactiveX documentation: Observable * @param * the type of item the Observer expects to observe diff --git a/src/main/java/io/reactivex/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java similarity index 96% rename from src/main/java/io/reactivex/Scheduler.java rename to src/main/java/io/reactivex/rxjava3/core/Scheduler.java index 2e99e288f1..952bbec74c 100644 --- a/src/main/java/io/reactivex/Scheduler.java +++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; - -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.schedulers.*; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.SchedulerRunnableIntrospection; +package io.reactivex.rxjava3.core; import java.util.concurrent.TimeUnit; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.schedulers.*; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.SchedulerRunnableIntrospection; + /** * A {@code Scheduler} is an object that specifies an API for scheduling * units of work provided in the form of {@link Runnable}s to be @@ -36,7 +36,7 @@ * scheme. *

    * You can get various standard, RxJava-specific instances of this class via - * the static methods of the {@link io.reactivex.schedulers.Schedulers} utility class. + * the static methods of the {@link io.reactivex.rxjava3.schedulers.Schedulers} utility class. *

    * The so-called {@link Worker}s of a {@code Scheduler} can be created via the {@link #createWorker()} method which allow the scheduling * of multiple {@link Runnable} tasks in an isolated manner. {@code Runnable} tasks scheduled on a {@code Worker} are guaranteed to be @@ -45,7 +45,7 @@ * In addition, outstanding or running tasks can be cancelled together via * {@link Worker#dispose()} without affecting any other {@code Worker} instances of the same {@code Scheduler}. *

    - * Implementations of the {@link #scheduleDirect} and {@link Worker#schedule} methods are encouraged to call the {@link io.reactivex.plugins.RxJavaPlugins#onSchedule(Runnable)} + * Implementations of the {@link #scheduleDirect} and {@link Worker#schedule} methods are encouraged to call the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onSchedule(Runnable)} * method to allow a scheduler hook to manipulate (wrap or replace) the original {@code Runnable} task before it is submitted to the * underlying task-execution scheme. *

    @@ -57,7 +57,7 @@ * This delegation is done via special wrapper instances around the original {@code Runnable} before calling the respective * {@code Worker.schedule} method. Note that this can lead to multiple {@code RxJavaPlugins.onSchedule} calls and potentially * multiple hooks applied. Therefore, the default implementations of {@code scheduleDirect} (and the {@link Worker#schedulePeriodically(Runnable, long, long, TimeUnit)}) - * wrap the incoming {@code Runnable} into a class that implements the {@link io.reactivex.schedulers.SchedulerRunnableIntrospection} + * wrap the incoming {@code Runnable} into a class that implements the {@link io.reactivex.rxjava3.schedulers.SchedulerRunnableIntrospection} * interface which can grant access to the original or hooked {@code Runnable}, thus, a repeated {@code RxJavaPlugins.onSchedule} * can detect the earlier hook and not apply a new one over again. *

    @@ -81,7 +81,7 @@ * underlying task-execution scheme supports stopping and restarting itself. *

    * If the {@code Scheduler} is shut down or a {@code Worker} is disposed, the {@code schedule} methods - * should return the {@link io.reactivex.disposables.Disposables#disposed()} singleton instance indicating the shut down/disposed + * should return the {@link io.reactivex.rxjava3.disposables.Disposables#disposed()} singleton instance indicating the shut down/disposed * state to the caller. Since the shutdown or dispose can happen from any thread, the {@code schedule} implementations * should make best effort to cancel tasks immediately after those tasks have been submitted to the * underlying task-execution scheme if the shutdown/dispose was detected after this submission. @@ -281,7 +281,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial * actions. Generally each {@link Flowable} uses its own {@link Worker}. * This means that this will essentially limit the number of concurrent * subscribes. The danger comes from using operators like - * {@link Flowable#zip(org.reactivestreams.Publisher, org.reactivestreams.Publisher, io.reactivex.functions.BiFunction)} where + * {@link Flowable#zip(org.reactivestreams.Publisher, org.reactivestreams.Publisher, io.reactivex.rxjava3.functions.BiFunction)} where * subscribing to the first {@link Flowable} could deadlock the * subscription to the second. * @@ -349,7 +349,7 @@ public S when(@NonNull Function * If the {@code Worker} is disposed, the {@code schedule} methods - * should return the {@link io.reactivex.disposables.Disposables#disposed()} singleton instance indicating the disposed + * should return the {@link io.reactivex.rxjava3.disposables.Disposables#disposed()} singleton instance indicating the disposed * state to the caller. Since the {@link #dispose()} call can happen on any thread, the {@code schedule} implementations * should make best effort to cancel tasks immediately after those tasks have been submitted to the * underlying task-execution scheme if the dispose was detected after this submission. diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java similarity index 99% rename from src/main/java/io/reactivex/Single.java rename to src/main/java/io/reactivex/rxjava3/core/Single.java index 7ab7ec3002..3cb676c9cf 100644 --- a/src/main/java/io/reactivex/Single.java +++ b/src/main/java/io/reactivex/rxjava3/core/Single.java @@ -11,30 +11,30 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; import java.util.NoSuchElementException; import java.util.concurrent.*; import org.reactivestreams.Publisher; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.*; -import io.reactivex.internal.operators.completable.*; -import io.reactivex.internal.operators.flowable.*; -import io.reactivex.internal.operators.maybe.*; -import io.reactivex.internal.operators.mixed.*; -import io.reactivex.internal.operators.observable.*; -import io.reactivex.internal.operators.single.*; -import io.reactivex.internal.util.*; -import io.reactivex.observers.TestObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.observers.*; +import io.reactivex.rxjava3.internal.operators.completable.*; +import io.reactivex.rxjava3.internal.operators.flowable.*; +import io.reactivex.rxjava3.internal.operators.maybe.*; +import io.reactivex.rxjava3.internal.operators.mixed.SingleFlatMapObservable; +import io.reactivex.rxjava3.internal.operators.observable.*; +import io.reactivex.rxjava3.internal.operators.single.*; +import io.reactivex.rxjava3.internal.util.ErrorMode; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * The {@code Single} class implements the Reactive Pattern for a single value response. @@ -59,7 +59,7 @@ * Like an {@code Observable}, a {@code Single} is lazy, can be either "hot" or "cold", synchronous or * asynchronous. {@code Single} instances returned by the methods of this class are cold * and there is a standard hot implementation in the form of a subject: - * {@link io.reactivex.subjects.SingleSubject SingleSubject}. + * {@link io.reactivex.rxjava3.subjects.SingleSubject SingleSubject}. *

    * The documentation for this class makes use of marble diagrams. The following legend explains these diagrams: *

    @@ -102,14 +102,14 @@ * {@code void} return of the {@link #subscribe(SingleObserver)} method) and it is the * responsibility of the implementor of the {@code SingleObserver} to allow this to happen. * RxJava supports such usage with the standard - * {@link io.reactivex.observers.DisposableSingleObserver DisposableSingleObserver} instance. + * {@link io.reactivex.rxjava3.observers.DisposableSingleObserver DisposableSingleObserver} instance. * For convenience, the {@link #subscribeWith(SingleObserver)} method is provided as well to * allow working with a {@code SingleObserver} (or subclass) instance to be applied with in * a fluent manner (such as in the example above). * @param * the type of the item emitted by the Single * @since 2.0 - * @see io.reactivex.observers.DisposableSingleObserver + * @see io.reactivex.rxjava3.observers.DisposableSingleObserver */ public abstract class Single implements SingleSource { @@ -433,7 +433,7 @@ public static Flowable concatArrayEager(SingleSource... sour *

    Backpressure:
    *
    Backpressure is honored towards the downstream and the outer Publisher is * expected to support backpressure. Violating this assumption, the operator will - * signal {@link io.reactivex.exceptions.MissingBackpressureException}.
    + * signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}. *
    Scheduler:
    *
    This method does not operate by default on a particular {@link Scheduler}.
    *
    @@ -610,7 +610,7 @@ public static Single error(final Throwable exception) { * delivered to the downstream via {@link SingleObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Single} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * *
    * @@ -836,7 +836,7 @@ public static Single fromObservable(ObservableSource observa * delivered to the downstream via {@link SingleObserver#onError(Throwable)}, * except when the downstream has disposed this {@code Single} source. * In this latter case, the {@code Throwable} is delivered to the global error handler via - * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}. + * {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}. * * * @@ -3518,7 +3518,7 @@ public final Single retryWhen(Function, ? extends * Subscribes to a Single but ignore its emission or notification. *

    * If the Single emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

    *
    Scheduler:
    @@ -3564,7 +3564,7 @@ public final Disposable subscribe(final BiConsumer * Subscribes to a Single and provides a callback to handle the item it emits. *

    * If the Single emits an error, it is wrapped into an - * {@link io.reactivex.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} + * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException} * and routed to the RxJavaPlugins.onError handler. *

    *
    Scheduler:
    diff --git a/src/main/java/io/reactivex/SingleConverter.java b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java similarity index 93% rename from src/main/java/io/reactivex/SingleConverter.java rename to src/main/java/io/reactivex/rxjava3/core/SingleConverter.java index a22f641f3b..5309dbc160 100644 --- a/src/main/java/io/reactivex/SingleConverter.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Convenience interface and callback used by the {@link Single#to} operator to turn a Single into another diff --git a/src/main/java/io/reactivex/SingleEmitter.java b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java similarity index 91% rename from src/main/java/io/reactivex/SingleEmitter.java rename to src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java index 9c1ded1575..a2302c5f4c 100644 --- a/src/main/java/io/reactivex/SingleEmitter.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Cancellable; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Cancellable; /** * Abstraction over an RxJava {@link SingleObserver} that allows associating @@ -26,7 +26,7 @@ *

    * Calling {@link #onSuccess(Object)} multiple times has no effect. * Calling {@link #onError(Throwable)} multiple times or after {@code onSuccess} will route the - * exception into the global error handler via {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * exception into the global error handler via {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. *

    * The emitter allows the registration of a single resource, in the form of a {@link Disposable} * or {@link Cancellable} via {@link #setDisposable(Disposable)} or {@link #setCancellable(Cancellable)} @@ -36,14 +36,14 @@ *

    * Only one {@code Disposable} or {@code Cancellable} object can be associated with the emitter at * a time. Calling either {@code set} method will dispose/cancel any previous object. If there - * is a need for handling multiple resources, one can create a {@link io.reactivex.disposables.CompositeDisposable} + * is a need for handling multiple resources, one can create a {@link io.reactivex.rxjava3.disposables.CompositeDisposable} * and associate that with the emitter instead. *

    * The {@link Cancellable} is logically equivalent to {@code Disposable} but allows using cleanup logic that can * throw a checked exception (such as many {@code close()} methods on Java IO components). Since * the release of resources happens after the terminal events have been delivered or the sequence gets * cancelled, exceptions throw within {@code Cancellable} are routed to the global error handler via - * {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}. + * {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}. * * @param the value type to emit */ diff --git a/src/main/java/io/reactivex/SingleObserver.java b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java similarity index 96% rename from src/main/java/io/reactivex/SingleObserver.java rename to src/main/java/io/reactivex/rxjava3/core/SingleObserver.java index 6fefe167a8..778d6feabc 100644 --- a/src/main/java/io/reactivex/SingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.disposables.Disposable; /** * Provides a mechanism for receiving push-based notification of a single value or an error. diff --git a/src/main/java/io/reactivex/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java similarity index 93% rename from src/main/java/io/reactivex/SingleOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java index 7cb13bcf8a..157a8e42dc 100644 --- a/src/main/java/io/reactivex/SingleOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that has a {@code subscribe()} method that receives diff --git a/src/main/java/io/reactivex/SingleOperator.java b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java similarity index 93% rename from src/main/java/io/reactivex/SingleOperator.java rename to src/main/java/io/reactivex/rxjava3/core/SingleOperator.java index 92ccfe7927..58ea9d338e 100644 --- a/src/main/java/io/reactivex/SingleOperator.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to map/wrap a downstream observer to an upstream observer. diff --git a/src/main/java/io/reactivex/SingleSource.java b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java similarity index 93% rename from src/main/java/io/reactivex/SingleSource.java rename to src/main/java/io/reactivex/rxjava3/core/SingleSource.java index befdd5858a..1a3780c3f6 100644 --- a/src/main/java/io/reactivex/SingleSource.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents a basic {@link Single} source base interface, diff --git a/src/main/java/io/reactivex/SingleTransformer.java b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java similarity index 93% rename from src/main/java/io/reactivex/SingleTransformer.java rename to src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java index bb0a7c1a06..080a2d7af1 100644 --- a/src/main/java/io/reactivex/SingleTransformer.java +++ b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex; +package io.reactivex.rxjava3.core; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Interface to compose Singles. diff --git a/src/main/java/io/reactivex/package-info.java b/src/main/java/io/reactivex/rxjava3/core/package-info.java similarity index 72% rename from src/main/java/io/reactivex/package-info.java rename to src/main/java/io/reactivex/rxjava3/core/package-info.java index 7d78294b6d..91717d0178 100644 --- a/src/main/java/io/reactivex/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/core/package-info.java @@ -14,9 +14,9 @@ * limitations under the License. */ /** - * Base reactive classes: {@link io.reactivex.Flowable}, {@link io.reactivex.Observable}, - * {@link io.reactivex.Single}, {@link io.reactivex.Maybe} and - * {@link io.reactivex.Completable}; base reactive consumers; + * Base reactive classes: {@link io.reactivex.rxjava3.core.Flowable}, {@link io.reactivex.rxjava3.core.Observable}, + * {@link io.reactivex.rxjava3.core.Single}, {@link io.reactivex.rxjava3.core.Maybe} and + * {@link io.reactivex.rxjava3.core.Completable}; base reactive consumers; * other common base interfaces. * *

    A library that enables subscribing to and composing asynchronous events and @@ -45,10 +45,10 @@ * *

    Services which intend on exposing data asynchronously and wish * to allow reactive processing and composition can implement the - * {@link io.reactivex.Flowable}, {@link io.reactivex.Observable}, {@link io.reactivex.Single}, - * {@link io.reactivex.Maybe} or {@link io.reactivex.Completable} class which then allow + * {@link io.reactivex.rxjava3.core.Flowable}, {@link io.reactivex.rxjava3.core.Observable}, {@link io.reactivex.rxjava3.core.Single}, + * {@link io.reactivex.rxjava3.core.Maybe} or {@link io.reactivex.rxjava3.core.Completable} class which then allow * consumers to subscribe to them and receive events.

    - *

    Usage examples can be found on the {@link io.reactivex.Flowable}/{@link io.reactivex.Observable} and {@link org.reactivestreams.Subscriber} classes.

    + *

    Usage examples can be found on the {@link io.reactivex.rxjava3.core.Flowable}/{@link io.reactivex.rxjava3.core.Observable} and {@link org.reactivestreams.Subscriber} classes.

    */ -package io.reactivex; +package io.reactivex.rxjava3.core; diff --git a/src/main/java/io/reactivex/disposables/ActionDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java similarity index 83% rename from src/main/java/io/reactivex/disposables/ActionDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java index 447dfe2e34..b166862ff9 100644 --- a/src/main/java/io/reactivex/disposables/ActionDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; -import io.reactivex.annotations.NonNull; -import io.reactivex.functions.Action; -import io.reactivex.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; final class ActionDisposable extends ReferenceDisposable { diff --git a/src/main/java/io/reactivex/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java similarity index 96% rename from src/main/java/io/reactivex/disposables/CompositeDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java index f7a1bf4a36..2d35b8d6be 100644 --- a/src/main/java/io/reactivex/disposables/CompositeDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; import java.util.*; -import io.reactivex.annotations.NonNull; -import io.reactivex.exceptions.*; -import io.reactivex.internal.disposables.DisposableContainer; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableContainer; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.*; /** * A disposable container that can hold onto multiple other disposables and diff --git a/src/main/java/io/reactivex/disposables/Disposable.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java similarity index 95% rename from src/main/java/io/reactivex/disposables/Disposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/Disposable.java index 974d03937d..2fab6e83ed 100644 --- a/src/main/java/io/reactivex/disposables/Disposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; /** * Represents a disposable resource. diff --git a/src/main/java/io/reactivex/disposables/Disposables.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java similarity index 93% rename from src/main/java/io/reactivex/disposables/Disposables.java rename to src/main/java/io/reactivex/rxjava3/disposables/Disposables.java index 7fbac0f63e..d566b744f4 100644 --- a/src/main/java/io/reactivex/disposables/Disposables.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java @@ -11,16 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; import java.util.concurrent.Future; -import io.reactivex.annotations.NonNull; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.*; import org.reactivestreams.Subscription; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.*; + /** * Utility class to help create disposables by wrapping * other types. diff --git a/src/main/java/io/reactivex/disposables/FutureDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java similarity index 97% rename from src/main/java/io/reactivex/disposables/FutureDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java index 0b3a67722a..0a900f6ed1 100644 --- a/src/main/java/io/reactivex/disposables/FutureDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/io/reactivex/disposables/ReferenceDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java similarity index 90% rename from src/main/java/io/reactivex/disposables/ReferenceDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java index 100b1848ed..e5032d694b 100644 --- a/src/main/java/io/reactivex/disposables/ReferenceDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.annotations.NonNull; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Base class for Disposable containers that manage some other type that diff --git a/src/main/java/io/reactivex/disposables/RunnableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java similarity index 92% rename from src/main/java/io/reactivex/disposables/RunnableDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java index a70df60317..43eee3105c 100644 --- a/src/main/java/io/reactivex/disposables/RunnableDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A disposable container that manages a Runnable instance. diff --git a/src/main/java/io/reactivex/disposables/SerialDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java similarity index 94% rename from src/main/java/io/reactivex/disposables/SerialDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java index d5063928a2..187a94b1e5 100644 --- a/src/main/java/io/reactivex/disposables/SerialDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A Disposable container that allows atomically updating/replacing the contained diff --git a/src/main/java/io/reactivex/disposables/SubscriptionDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java similarity index 91% rename from src/main/java/io/reactivex/disposables/SubscriptionDisposable.java rename to src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java index ebf8934a37..f6756b58de 100644 --- a/src/main/java/io/reactivex/disposables/SubscriptionDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java @@ -10,11 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; -import io.reactivex.annotations.NonNull; import org.reactivestreams.Subscription; +import io.reactivex.rxjava3.annotations.NonNull; + /** * A Disposable container that handles a {@link Subscription}. */ diff --git a/src/main/java/io/reactivex/disposables/package-info.java b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java similarity index 95% rename from src/main/java/io/reactivex/disposables/package-info.java rename to src/main/java/io/reactivex/rxjava3/disposables/package-info.java index 8d162a7854..fc3c4221b9 100644 --- a/src/main/java/io/reactivex/disposables/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java @@ -19,4 +19,4 @@ * (Disposable container types) and utility classes to construct * Disposables from callbacks and other types. */ -package io.reactivex.disposables; +package io.reactivex.rxjava3.disposables; diff --git a/src/main/java/io/reactivex/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java similarity index 99% rename from src/main/java/io/reactivex/exceptions/CompositeException.java rename to src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java index 4915688379..81a64ffbe7 100644 --- a/src/main/java/io/reactivex/exceptions/CompositeException.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; import java.io.*; import java.util.*; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents an exception that is a composite of one or more other exceptions. A {@code CompositeException} diff --git a/src/main/java/io/reactivex/exceptions/Exceptions.java b/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java similarity index 95% rename from src/main/java/io/reactivex/exceptions/Exceptions.java rename to src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java index 42c2aa360d..41ddbd4fed 100644 --- a/src/main/java/io/reactivex/exceptions/Exceptions.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; -import io.reactivex.annotations.*; -import io.reactivex.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; /** * Utility class to help propagate checked exceptions and rethrow exceptions diff --git a/src/main/java/io/reactivex/exceptions/MissingBackpressureException.java b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java similarity index 96% rename from src/main/java/io/reactivex/exceptions/MissingBackpressureException.java rename to src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java index 3bd05864b5..f7b19a2fc2 100644 --- a/src/main/java/io/reactivex/exceptions/MissingBackpressureException.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; /** * Indicates that an operator attempted to emit a value but the downstream wasn't ready for it. diff --git a/src/main/java/io/reactivex/exceptions/OnErrorNotImplementedException.java b/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java similarity index 96% rename from src/main/java/io/reactivex/exceptions/OnErrorNotImplementedException.java rename to src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java index 1cfe421916..d70769af39 100644 --- a/src/main/java/io/reactivex/exceptions/OnErrorNotImplementedException.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; /** * Represents an exception used to signal to the {@code RxJavaPlugins.onError()} that a diff --git a/src/main/java/io/reactivex/exceptions/ProtocolViolationException.java b/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java similarity index 96% rename from src/main/java/io/reactivex/exceptions/ProtocolViolationException.java rename to src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java index 09c0361108..9df2ed9762 100644 --- a/src/main/java/io/reactivex/exceptions/ProtocolViolationException.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; /** * Explicitly named exception to indicate a Reactive-Streams diff --git a/src/main/java/io/reactivex/exceptions/UndeliverableException.java b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java similarity index 97% rename from src/main/java/io/reactivex/exceptions/UndeliverableException.java rename to src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java index d3923e0cdd..6c84920e74 100644 --- a/src/main/java/io/reactivex/exceptions/UndeliverableException.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; /** * Wrapper for Throwable errors that are sent to `RxJavaPlugins.onError`. diff --git a/src/main/java/io/reactivex/exceptions/package-info.java b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java similarity index 94% rename from src/main/java/io/reactivex/exceptions/package-info.java rename to src/main/java/io/reactivex/rxjava3/exceptions/package-info.java index 1a6c6d6180..1b3340e414 100644 --- a/src/main/java/io/reactivex/exceptions/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java @@ -18,4 +18,4 @@ * Exception handling utilities, safe subscriber exception classes, * lifecycle exception classes. */ -package io.reactivex.exceptions; +package io.reactivex.rxjava3.exceptions; diff --git a/src/main/java/io/reactivex/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java similarity index 96% rename from src/main/java/io/reactivex/flowables/ConnectableFlowable.java rename to src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java index f2d66563a2..8b09993ac2 100644 --- a/src/main/java/io/reactivex/flowables/ConnectableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.flowables; +package io.reactivex.rxjava3.flowables; import java.util.concurrent.TimeUnit; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.operators.flowable.*; -import io.reactivex.internal.util.ConnectConsumer; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.operators.flowable.*; +import io.reactivex.rxjava3.internal.util.ConnectConsumer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * A {@code ConnectableFlowable} resembles an ordinary {@link Flowable}, except that it does not begin @@ -78,7 +78,7 @@ public abstract class ConnectableFlowable extends Flowable { * Instructs the {@code ConnectableFlowable} to begin emitting the items from its underlying * {@link Flowable} to its {@link Subscriber}s. *

    - * To disconnect from a synchronous source, use the {@link #connect(io.reactivex.functions.Consumer)} method. + * To disconnect from a synchronous source, use the {@link #connect(io.reactivex.rxjava3.functions.Consumer)} method. * * @return the subscription representing the connection * @see ReactiveX documentation: Connect diff --git a/src/main/java/io/reactivex/flowables/GroupedFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java similarity index 90% rename from src/main/java/io/reactivex/flowables/GroupedFlowable.java rename to src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java index d640f4e0e5..d9564c3e6e 100644 --- a/src/main/java/io/reactivex/flowables/GroupedFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java @@ -10,10 +10,10 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.flowables; +package io.reactivex.rxjava3.flowables; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; /** * A {@link Flowable} that has been grouped by key, the value of which can be obtained with {@link #getKey()}. @@ -27,7 +27,7 @@ * the type of the key * @param * the type of the items emitted by the {@code GroupedFlowable} - * @see Flowable#groupBy(io.reactivex.functions.Function) + * @see Flowable#groupBy(io.reactivex.rxjava3.functions.Function) * @see ReactiveX documentation: GroupBy */ public abstract class GroupedFlowable extends Flowable { diff --git a/src/main/java/io/reactivex/flowables/package-info.java b/src/main/java/io/reactivex/rxjava3/flowables/package-info.java similarity index 80% rename from src/main/java/io/reactivex/flowables/package-info.java rename to src/main/java/io/reactivex/rxjava3/flowables/package-info.java index 66f3f48b62..75a6dec4e9 100644 --- a/src/main/java/io/reactivex/flowables/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/flowables/package-info.java @@ -16,7 +16,7 @@ /** * Classes supporting the Flowable base reactive class: - * {@link io.reactivex.flowables.ConnectableFlowable} and - * {@link io.reactivex.flowables.GroupedFlowable}. + * {@link io.reactivex.rxjava3.flowables.ConnectableFlowable} and + * {@link io.reactivex.rxjava3.flowables.GroupedFlowable}. */ -package io.reactivex.flowables; +package io.reactivex.rxjava3.flowables; diff --git a/src/main/java/io/reactivex/functions/Action.java b/src/main/java/io/reactivex/rxjava3/functions/Action.java similarity index 95% rename from src/main/java/io/reactivex/functions/Action.java rename to src/main/java/io/reactivex/rxjava3/functions/Action.java index a871855925..153eff9375 100644 --- a/src/main/java/io/reactivex/functions/Action.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Action.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface similar to Runnable but allows throwing a checked exception. diff --git a/src/main/java/io/reactivex/functions/BiConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java similarity index 96% rename from src/main/java/io/reactivex/functions/BiConsumer.java rename to src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java index 66cd9ea744..c060c38331 100644 --- a/src/main/java/io/reactivex/functions/BiConsumer.java +++ b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface (callback) that accepts two values (of possibly different types). diff --git a/src/main/java/io/reactivex/functions/BiFunction.java b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java similarity index 92% rename from src/main/java/io/reactivex/functions/BiFunction.java rename to src/main/java/io/reactivex/rxjava3/functions/BiFunction.java index e85638ebd6..f7e1174c6e 100644 --- a/src/main/java/io/reactivex/functions/BiFunction.java +++ b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/BiPredicate.java b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java similarity index 92% rename from src/main/java/io/reactivex/functions/BiPredicate.java rename to src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java index f0bbe532e5..4793e1d086 100644 --- a/src/main/java/io/reactivex/functions/BiPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that returns true or false for the given input values. diff --git a/src/main/java/io/reactivex/functions/BooleanSupplier.java b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java similarity index 95% rename from src/main/java/io/reactivex/functions/BooleanSupplier.java rename to src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java index 7e91eab38b..dc801e5180 100644 --- a/src/main/java/io/reactivex/functions/BooleanSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface (callback) that returns a boolean value. diff --git a/src/main/java/io/reactivex/functions/Cancellable.java b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java similarity index 95% rename from src/main/java/io/reactivex/functions/Cancellable.java rename to src/main/java/io/reactivex/rxjava3/functions/Cancellable.java index e28c6fe53d..47683eafdc 100644 --- a/src/main/java/io/reactivex/functions/Cancellable.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface that has a single cancel method diff --git a/src/main/java/io/reactivex/functions/Consumer.java b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java similarity index 95% rename from src/main/java/io/reactivex/functions/Consumer.java rename to src/main/java/io/reactivex/rxjava3/functions/Consumer.java index afa65e9164..08d94eb928 100644 --- a/src/main/java/io/reactivex/functions/Consumer.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface (callback) that accepts a single value. diff --git a/src/main/java/io/reactivex/functions/Function.java b/src/main/java/io/reactivex/rxjava3/functions/Function.java similarity index 92% rename from src/main/java/io/reactivex/functions/Function.java rename to src/main/java/io/reactivex/rxjava3/functions/Function.java index 71eea769bb..23d06b041b 100644 --- a/src/main/java/io/reactivex/functions/Function.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface that takes a value and returns another value, possibly with a diff --git a/src/main/java/io/reactivex/functions/Function3.java b/src/main/java/io/reactivex/rxjava3/functions/Function3.java similarity index 93% rename from src/main/java/io/reactivex/functions/Function3.java rename to src/main/java/io/reactivex/rxjava3/functions/Function3.java index 87bc13ee70..bdc1b4af2b 100644 --- a/src/main/java/io/reactivex/functions/Function3.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function3.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function4.java b/src/main/java/io/reactivex/rxjava3/functions/Function4.java similarity index 93% rename from src/main/java/io/reactivex/functions/Function4.java rename to src/main/java/io/reactivex/rxjava3/functions/Function4.java index 5df1bcf98e..907f742907 100644 --- a/src/main/java/io/reactivex/functions/Function4.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function4.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function5.java b/src/main/java/io/reactivex/rxjava3/functions/Function5.java similarity index 94% rename from src/main/java/io/reactivex/functions/Function5.java rename to src/main/java/io/reactivex/rxjava3/functions/Function5.java index 1bb52951d5..a8468844b7 100644 --- a/src/main/java/io/reactivex/functions/Function5.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function5.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function6.java b/src/main/java/io/reactivex/rxjava3/functions/Function6.java similarity index 94% rename from src/main/java/io/reactivex/functions/Function6.java rename to src/main/java/io/reactivex/rxjava3/functions/Function6.java index 2096504cda..6bc5caec1f 100644 --- a/src/main/java/io/reactivex/functions/Function6.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function6.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function7.java b/src/main/java/io/reactivex/rxjava3/functions/Function7.java similarity index 94% rename from src/main/java/io/reactivex/functions/Function7.java rename to src/main/java/io/reactivex/rxjava3/functions/Function7.java index a96984350c..32d5a08e41 100644 --- a/src/main/java/io/reactivex/functions/Function7.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function7.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function8.java b/src/main/java/io/reactivex/rxjava3/functions/Function8.java similarity index 95% rename from src/main/java/io/reactivex/functions/Function8.java rename to src/main/java/io/reactivex/rxjava3/functions/Function8.java index 433b9ba416..8a7a88f9e8 100644 --- a/src/main/java/io/reactivex/functions/Function8.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function8.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/Function9.java b/src/main/java/io/reactivex/rxjava3/functions/Function9.java similarity index 95% rename from src/main/java/io/reactivex/functions/Function9.java rename to src/main/java/io/reactivex/rxjava3/functions/Function9.java index 7f426a972c..28319eac14 100644 --- a/src/main/java/io/reactivex/functions/Function9.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Function9.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that computes a value based on multiple input values. diff --git a/src/main/java/io/reactivex/functions/IntFunction.java b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java similarity index 92% rename from src/main/java/io/reactivex/functions/IntFunction.java rename to src/main/java/io/reactivex/rxjava3/functions/IntFunction.java index 167328c2ce..8a135ad491 100644 --- a/src/main/java/io/reactivex/functions/IntFunction.java +++ b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that takes a primitive value and return value of type T. diff --git a/src/main/java/io/reactivex/functions/LongConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java similarity index 95% rename from src/main/java/io/reactivex/functions/LongConsumer.java rename to src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java index a921ae18df..6b5b72101c 100644 --- a/src/main/java/io/reactivex/functions/LongConsumer.java +++ b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface (callback) that consumes a primitive long value. diff --git a/src/main/java/io/reactivex/functions/Predicate.java b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java similarity index 92% rename from src/main/java/io/reactivex/functions/Predicate.java rename to src/main/java/io/reactivex/rxjava3/functions/Predicate.java index 7534454e37..3197114158 100644 --- a/src/main/java/io/reactivex/functions/Predicate.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; -import io.reactivex.annotations.NonNull; +import io.reactivex.rxjava3.annotations.NonNull; /** * A functional interface (callback) that returns true or false for the given input value. diff --git a/src/main/java/io/reactivex/functions/Supplier.java b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java similarity index 96% rename from src/main/java/io/reactivex/functions/Supplier.java rename to src/main/java/io/reactivex/rxjava3/functions/Supplier.java index 0e76500ede..95ef2e88a1 100644 --- a/src/main/java/io/reactivex/functions/Supplier.java +++ b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; /** * A functional interface (callback) that provides a single value or diff --git a/src/main/java/io/reactivex/functions/package-info.java b/src/main/java/io/reactivex/rxjava3/functions/package-info.java similarity index 94% rename from src/main/java/io/reactivex/functions/package-info.java rename to src/main/java/io/reactivex/rxjava3/functions/package-info.java index 3e91a5fd81..a7d92ce8fb 100644 --- a/src/main/java/io/reactivex/functions/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/functions/package-info.java @@ -18,4 +18,4 @@ * Functional interfaces of functions and actions of arity 0 to 9 and related * utility classes. */ -package io.reactivex.functions; +package io.reactivex.rxjava3.functions; diff --git a/src/main/java/io/reactivex/internal/disposables/ArrayCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java similarity index 96% rename from src/main/java/io/reactivex/internal/disposables/ArrayCompositeDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java index 24af60d3d2..5ebcdde15b 100644 --- a/src/main/java/io/reactivex/internal/disposables/ArrayCompositeDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; import java.util.concurrent.atomic.AtomicReferenceArray; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A composite disposable with a fixed number of slots. diff --git a/src/main/java/io/reactivex/internal/disposables/CancellableDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java similarity index 85% rename from src/main/java/io/reactivex/internal/disposables/CancellableDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java index ba5750a34c..314464e156 100644 --- a/src/main/java/io/reactivex/internal/disposables/CancellableDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Cancellable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A disposable container that wraps a Cancellable instance. diff --git a/src/main/java/io/reactivex/internal/disposables/DisposableContainer.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java similarity index 93% rename from src/main/java/io/reactivex/internal/disposables/DisposableContainer.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java index e720fef5c2..9aa145556b 100644 --- a/src/main/java/io/reactivex/internal/disposables/DisposableContainer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * Common interface to add and remove disposables from a container. diff --git a/src/main/java/io/reactivex/internal/disposables/DisposableHelper.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java similarity index 95% rename from src/main/java/io/reactivex/internal/disposables/DisposableHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java index 46f13bd743..3a8c5d7029 100644 --- a/src/main/java/io/reactivex/internal/disposables/DisposableHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.ProtocolViolationException; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.ProtocolViolationException; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods for working with Disposables atomically. diff --git a/src/main/java/io/reactivex/internal/disposables/EmptyDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java similarity index 93% rename from src/main/java/io/reactivex/internal/disposables/EmptyDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java index 4e90491b69..d08ce8d14a 100644 --- a/src/main/java/io/reactivex/internal/disposables/EmptyDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; /** * Represents a stateless empty Disposable that reports being always diff --git a/src/main/java/io/reactivex/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java similarity index 94% rename from src/main/java/io/reactivex/internal/disposables/ListCompositeDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java index a9e539bc6b..c1233577b2 100644 --- a/src/main/java/io/reactivex/internal/disposables/ListCompositeDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; import java.util.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; /** * A disposable container that can hold onto multiple other disposables. diff --git a/src/main/java/io/reactivex/internal/disposables/SequentialDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java similarity index 96% rename from src/main/java/io/reactivex/internal/disposables/SequentialDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java index 458194ab63..d9922ebec8 100644 --- a/src/main/java/io/reactivex/internal/disposables/SequentialDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.disposables; +package io.reactivex.rxjava3.internal.disposables; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A Disposable container that allows updating/replacing a Disposable diff --git a/src/main/java/io/reactivex/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java similarity index 98% rename from src/main/java/io/reactivex/internal/functions/Functions.java rename to src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java index 632084b075..87aae2e1e8 100644 --- a/src/main/java/io/reactivex/internal/functions/Functions.java +++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java @@ -10,18 +10,18 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.functions; +package io.reactivex.rxjava3.internal.functions; import java.util.*; import java.util.concurrent.*; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.exceptions.OnErrorNotImplementedException; -import io.reactivex.functions.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Timed; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Timed; /** * Utility methods to convert the BiFunction, Function3..Function9 instances to Function of Object array. diff --git a/src/main/java/io/reactivex/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java similarity index 97% rename from src/main/java/io/reactivex/internal/functions/ObjectHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java index e77dd2ac0d..c13b1850f2 100644 --- a/src/main/java/io/reactivex/internal/functions/ObjectHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.functions; +package io.reactivex.rxjava3.internal.functions; -import io.reactivex.functions.BiPredicate; +import io.reactivex.rxjava3.functions.BiPredicate; /** * Utility methods containing the backport of Java 7's Objects utility class. diff --git a/src/main/java/io/reactivex/internal/fuseable/ConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java similarity index 92% rename from src/main/java/io/reactivex/internal/fuseable/ConditionalSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java index 4535b9c18d..2b4fe68be1 100644 --- a/src/main/java/io/reactivex/internal/fuseable/ConditionalSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.FlowableSubscriber; +import io.reactivex.rxjava3.core.FlowableSubscriber; /** * A Subscriber with an additional {@link #tryOnNext(Object)} method that diff --git a/src/main/java/io/reactivex/internal/fuseable/FuseToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java similarity index 94% rename from src/main/java/io/reactivex/internal/fuseable/FuseToFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java index 782e0815dd..2b7bb614e7 100644 --- a/src/main/java/io/reactivex/internal/fuseable/FuseToFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; /** * Interface indicating a operator implementation can be macro-fused back to Flowable in case diff --git a/src/main/java/io/reactivex/internal/fuseable/FuseToMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/fuseable/FuseToMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java index 733ea13e24..c2db8c7de6 100644 --- a/src/main/java/io/reactivex/internal/fuseable/FuseToMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.Maybe; +import io.reactivex.rxjava3.core.Maybe; /** * Interface indicating an operator implementation can be macro-fused back to Maybe in case diff --git a/src/main/java/io/reactivex/internal/fuseable/FuseToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java similarity index 94% rename from src/main/java/io/reactivex/internal/fuseable/FuseToObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java index 3d89c84b57..8488ccf6e8 100644 --- a/src/main/java/io/reactivex/internal/fuseable/FuseToObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.Observable; +import io.reactivex.rxjava3.core.Observable; /** * Interface indicating a operator implementation can be macro-fused back to Observable in case diff --git a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamCompletableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java similarity index 90% rename from src/main/java/io/reactivex/internal/fuseable/HasUpstreamCompletableSource.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java index 49144184d9..38f199b9dc 100644 --- a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamCompletableSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.CompletableSource; +import io.reactivex.rxjava3.core.CompletableSource; /** * Interface indicating the implementor has an upstream CompletableSource-like source available diff --git a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamMaybeSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java similarity index 91% rename from src/main/java/io/reactivex/internal/fuseable/HasUpstreamMaybeSource.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java index a178cfe21a..0a7d36ed86 100644 --- a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamMaybeSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.MaybeSource; +import io.reactivex.rxjava3.core.MaybeSource; /** * Interface indicating the implementor has an upstream MaybeSource-like source available diff --git a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamObservableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java similarity index 91% rename from src/main/java/io/reactivex/internal/fuseable/HasUpstreamObservableSource.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java index 0729841702..0ab946c4c0 100644 --- a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamObservableSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.ObservableSource; +import io.reactivex.rxjava3.core.ObservableSource; /** * Interface indicating the implementor has an upstream ObservableSource-like source available diff --git a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java similarity index 95% rename from src/main/java/io/reactivex/internal/fuseable/HasUpstreamPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java index 58ec7ed2b5..9afa5ce9e0 100644 --- a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; import org.reactivestreams.Publisher; diff --git a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamSingleSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java similarity index 91% rename from src/main/java/io/reactivex/internal/fuseable/HasUpstreamSingleSource.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java index baa2e14eba..db94a572e1 100644 --- a/src/main/java/io/reactivex/internal/fuseable/HasUpstreamSingleSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.SingleSource; +import io.reactivex.rxjava3.core.SingleSource; /** * Interface indicating the implementor has an upstream SingleSource-like source available diff --git a/src/main/java/io/reactivex/internal/fuseable/QueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java similarity index 96% rename from src/main/java/io/reactivex/internal/fuseable/QueueDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java index 078532469d..2becb58d43 100644 --- a/src/main/java/io/reactivex/internal/fuseable/QueueDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; import java.util.Queue; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * An interface extending Queue and Disposable and allows negotiating diff --git a/src/main/java/io/reactivex/internal/fuseable/QueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java similarity index 98% rename from src/main/java/io/reactivex/internal/fuseable/QueueFuseable.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java index f5e803807e..fadc824cc7 100644 --- a/src/main/java/io/reactivex/internal/fuseable/QueueFuseable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; /** * Represents a SimpleQueue plus the means and constants for requesting a fusion mode. diff --git a/src/main/java/io/reactivex/internal/fuseable/QueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java similarity index 98% rename from src/main/java/io/reactivex/internal/fuseable/QueueSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java index c67224a606..87599a6e40 100644 --- a/src/main/java/io/reactivex/internal/fuseable/QueueSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; import java.util.Queue; diff --git a/src/main/java/io/reactivex/internal/fuseable/ScalarSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java similarity index 93% rename from src/main/java/io/reactivex/internal/fuseable/ScalarSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java index 4d51b11640..039d730be6 100644 --- a/src/main/java/io/reactivex/internal/fuseable/ScalarSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java @@ -10,9 +10,9 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.functions.Supplier; /** * A marker interface indicating that a scalar, constant value diff --git a/src/main/java/io/reactivex/internal/fuseable/SimplePlainQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java similarity index 89% rename from src/main/java/io/reactivex/internal/fuseable/SimplePlainQueue.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java index 9af3e0ca6d..3708580270 100644 --- a/src/main/java/io/reactivex/internal/fuseable/SimplePlainQueue.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.annotations.Nullable; +import io.reactivex.rxjava3.annotations.Nullable; /** * Override of the SimpleQueue interface with no throws Exception on poll(). diff --git a/src/main/java/io/reactivex/internal/fuseable/SimpleQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java similarity index 96% rename from src/main/java/io/reactivex/internal/fuseable/SimpleQueue.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java index e5cb104bb6..29af5299d8 100644 --- a/src/main/java/io/reactivex/internal/fuseable/SimpleQueue.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.*; /** * A minimalist queue interface without the method bloat of java.util.Collection and java.util.Queue. diff --git a/src/main/java/io/reactivex/internal/fuseable/package-info.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java similarity index 93% rename from src/main/java/io/reactivex/internal/fuseable/package-info.java rename to src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java index 6436502ae7..b4ee869076 100644 --- a/src/main/java/io/reactivex/internal/fuseable/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java @@ -14,4 +14,4 @@ /** * Base interfaces and types for supporting operator-fusion. */ -package io.reactivex.internal.fuseable; +package io.reactivex.rxjava3.internal.fuseable; diff --git a/src/main/java/io/reactivex/internal/observers/BasicFuseableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java similarity index 93% rename from src/main/java/io/reactivex/internal/observers/BasicFuseableObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java index 56ec76bb61..0beef61824 100644 --- a/src/main/java/io/reactivex/internal/observers/BasicFuseableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; - -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.QueueDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.observers; + +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Base class for a fuseable intermediate observer. diff --git a/src/main/java/io/reactivex/internal/observers/BasicIntQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java similarity index 92% rename from src/main/java/io/reactivex/internal/observers/BasicIntQueueDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java index a5d2adf430..84a5c017b5 100644 --- a/src/main/java/io/reactivex/internal/observers/BasicIntQueueDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; /** * An abstract QueueDisposable implementation, extending an AtomicInteger, diff --git a/src/main/java/io/reactivex/internal/observers/BasicQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java similarity index 91% rename from src/main/java/io/reactivex/internal/observers/BasicQueueDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java index cad108bd4c..fb6fc08366 100644 --- a/src/main/java/io/reactivex/internal/observers/BasicQueueDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; -import io.reactivex.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; /** * An abstract QueueDisposable implementation that defaults all diff --git a/src/main/java/io/reactivex/internal/observers/BiConsumerSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java similarity index 84% rename from src/main/java/io/reactivex/internal/observers/BiConsumerSingleObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java index 188c78b1b3..2fb0221f64 100644 --- a/src/main/java/io/reactivex/internal/observers/BiConsumerSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiConsumer; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiConsumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class BiConsumerSingleObserver extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/observers/BlockingBaseObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java similarity index 91% rename from src/main/java/io/reactivex/internal/observers/BlockingBaseObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java index 63078f8e68..9a128799d5 100644 --- a/src/main/java/io/reactivex/internal/observers/BlockingBaseObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java @@ -10,13 +10,13 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.CountDownLatch; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.util.*; public abstract class BlockingBaseObserver extends CountDownLatch implements Observer, Disposable { diff --git a/src/main/java/io/reactivex/internal/observers/BlockingFirstObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java similarity index 95% rename from src/main/java/io/reactivex/internal/observers/BlockingFirstObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java index 212edb6bdb..276848afe4 100644 --- a/src/main/java/io/reactivex/internal/observers/BlockingFirstObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; /** * Blocks until the upstream signals its first value or completes. diff --git a/src/main/java/io/reactivex/internal/observers/BlockingLastObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java similarity index 95% rename from src/main/java/io/reactivex/internal/observers/BlockingLastObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java index 24d6345cc3..bf745d3ed1 100644 --- a/src/main/java/io/reactivex/internal/observers/BlockingLastObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; /** * Blocks until the upstream signals its last value or completes. diff --git a/src/main/java/io/reactivex/internal/observers/BlockingMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java similarity index 95% rename from src/main/java/io/reactivex/internal/observers/BlockingMultiObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java index a0dcb7bb9d..1f4ee305bd 100644 --- a/src/main/java/io/reactivex/internal/observers/BlockingMultiObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.util.*; /** * A combined Observer that awaits the success or error signal via a CountDownLatch. diff --git a/src/main/java/io/reactivex/internal/observers/BlockingObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java similarity index 86% rename from src/main/java/io/reactivex/internal/observers/BlockingObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java index 4731dc380d..da38180751 100644 --- a/src/main/java/io/reactivex/internal/observers/BlockingObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.Queue; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.util.NotificationLite; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.NotificationLite; public final class BlockingObserver extends AtomicReference implements Observer, Disposable { diff --git a/src/main/java/io/reactivex/internal/observers/CallbackCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java similarity index 84% rename from src/main/java/io/reactivex/internal/observers/CallbackCompletableObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java index ee059c5b37..f6e7fed1cd 100644 --- a/src/main/java/io/reactivex/internal/observers/CallbackCompletableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.CompletableObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CallbackCompletableObserver extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/observers/ConsumerSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java similarity index 81% rename from src/main/java/io/reactivex/internal/observers/ConsumerSingleObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java index 59735e9c11..b29a74e4bb 100644 --- a/src/main/java/io/reactivex/internal/observers/ConsumerSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ConsumerSingleObserver extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/observers/DeferredScalarDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java similarity index 95% rename from src/main/java/io/reactivex/internal/observers/DeferredScalarDisposable.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java index a975f0aecc..8db129efb6 100644 --- a/src/main/java/io/reactivex/internal/observers/DeferredScalarDisposable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; -import io.reactivex.Observer; -import io.reactivex.annotations.Nullable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Represents a fuseable container for a single value. diff --git a/src/main/java/io/reactivex/internal/observers/DeferredScalarObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java similarity index 89% rename from src/main/java/io/reactivex/internal/observers/DeferredScalarObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java index 91236b37c2..a99fb49a57 100644 --- a/src/main/java/io/reactivex/internal/observers/DeferredScalarObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A fuseable Observer that can generate 0 or 1 resulting value. diff --git a/src/main/java/io/reactivex/internal/observers/DisposableLambdaObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java similarity index 89% rename from src/main/java/io/reactivex/internal/observers/DisposableLambdaObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java index 59d7fac2bc..2e935140ca 100644 --- a/src/main/java/io/reactivex/internal/observers/DisposableLambdaObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class DisposableLambdaObserver implements Observer, Disposable { final Observer downstream; diff --git a/src/main/java/io/reactivex/internal/observers/EmptyCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java similarity index 79% rename from src/main/java/io/reactivex/internal/observers/EmptyCompletableObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java index 38d0f3746e..36a08269c8 100644 --- a/src/main/java/io/reactivex/internal/observers/EmptyCompletableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.CompletableObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.OnErrorNotImplementedException; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class EmptyCompletableObserver extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/observers/ForEachWhileObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java similarity index 88% rename from src/main/java/io/reactivex/internal/observers/ForEachWhileObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java index 22ba3f80a8..7017239ae0 100644 --- a/src/main/java/io/reactivex/internal/observers/ForEachWhileObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ForEachWhileObserver extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/observers/FutureObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java similarity index 91% rename from src/main/java/io/reactivex/internal/observers/FutureObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java index 9b0d12140a..f3d067f7ca 100644 --- a/src/main/java/io/reactivex/internal/observers/FutureObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.NoSuchElementException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.BlockingHelper; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.BlockingHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * An Observer + Future that expects exactly one upstream value and provides it diff --git a/src/main/java/io/reactivex/internal/observers/FutureSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java similarity index 90% rename from src/main/java/io/reactivex/internal/observers/FutureSingleObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java index 1ad8242b5c..80abb70419 100644 --- a/src/main/java/io/reactivex/internal/observers/FutureSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.BlockingHelper; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.BlockingHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * An Observer + Future that expects exactly one upstream value and provides it diff --git a/src/main/java/io/reactivex/internal/observers/InnerQueuedObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java similarity index 90% rename from src/main/java/io/reactivex/internal/observers/InnerQueuedObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java index 3a18b38153..db89a98f6e 100644 --- a/src/main/java/io/reactivex/internal/observers/InnerQueuedObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; /** * Subscriber that can fuse with the upstream and calls a support interface diff --git a/src/main/java/io/reactivex/internal/observers/InnerQueuedObserverSupport.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java similarity index 95% rename from src/main/java/io/reactivex/internal/observers/InnerQueuedObserverSupport.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java index e2ff045af6..ff28bd092c 100644 --- a/src/main/java/io/reactivex/internal/observers/InnerQueuedObserverSupport.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; /** * Interface to allow the InnerQueuedSubscriber to call back a parent diff --git a/src/main/java/io/reactivex/internal/observers/LambdaObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java similarity index 86% rename from src/main/java/io/reactivex/internal/observers/LambdaObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java index 7549910637..c52017fa4d 100644 --- a/src/main/java/io/reactivex/internal/observers/LambdaObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class LambdaObserver extends AtomicReference implements Observer, Disposable, LambdaConsumerIntrospection { diff --git a/src/main/java/io/reactivex/internal/observers/QueueDrainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java similarity index 94% rename from src/main/java/io/reactivex/internal/observers/QueueDrainObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java index ab24a709f0..67bc900d17 100644 --- a/src/main/java/io/reactivex/internal/observers/QueueDrainObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.util.*; /** * Abstract base class for subscribers that hold another subscriber, a queue diff --git a/src/main/java/io/reactivex/internal/observers/ResumeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java similarity index 87% rename from src/main/java/io/reactivex/internal/observers/ResumeSingleObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java index 1dc1c5fa29..90a29bef1c 100644 --- a/src/main/java/io/reactivex/internal/observers/ResumeSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A SingleObserver implementation used for subscribing to the actual SingleSource diff --git a/src/main/java/io/reactivex/internal/observers/SubscriberCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java similarity index 87% rename from src/main/java/io/reactivex/internal/observers/SubscriberCompletableObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java index 8a5255d937..2bbc5128d6 100644 --- a/src/main/java/io/reactivex/internal/observers/SubscriberCompletableObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.observers; +package io.reactivex.rxjava3.internal.observers; import org.reactivestreams.*; -import io.reactivex.CompletableObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class SubscriberCompletableObserver implements CompletableObserver, Subscription { final Subscriber subscriber; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableAmb.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java index 7de1c648e4..14e8ae464b 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableAmb.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableAmb extends Completable { private final CompletableSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java index ff7b6cced5..d006329aea 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class CompletableAndThenCompletable extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableCache.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java index ef1cc3c65f..253e518dad 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableCache.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Consume the upstream source exactly once and cache its terminal event. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java index cf52bf9755..9d55b626ea 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableConcat extends Completable { final Publisher sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableConcatArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java index 6bcf9d5516..c423c37587 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcatArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class CompletableConcatArray extends Completable { final CompletableSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableConcatIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java index acc2d12fd0..c36f546c16 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcatIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableConcatIterable extends Completable { final Iterable sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java index 1e2bc74f79..61ef4b15d2 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Cancellable; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableCreate extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDefer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java index 029f1a3278..0e28d0d28f 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableDefer extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDelay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java index a23fd003f1..49c25bf6e1 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDelay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class CompletableDelay extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDetach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java index f19a0a045d..efd28228fa 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDetach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Breaks the references between the upstream and downstream when the Completable terminates. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDisposeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDisposeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java index 904894df7c..16f9fa159c 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDisposeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableDisposeOn extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDoFinally.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java index 67e4ad5da1..425ed4caea 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDoFinally.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action after an onError, onComplete or a dispose event. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableDoOnEvent.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java index 3499a553a1..63a408efc4 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableDoOnEvent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java @@ -11,15 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.CompletableSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Consumer; public final class CompletableDoOnEvent extends Completable { final CompletableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java index dc6b6c5fa2..e18ccc9421 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; public final class CompletableEmpty extends Completable { public static final Completable INSTANCE = new CompletableEmpty(); diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java index e7d6a23bf5..70d4e41006 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; public final class CompletableError extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableErrorSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java similarity index 79% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableErrorSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java index 5b10600cd3..12b39277db 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableErrorSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableErrorSupplier extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java similarity index 81% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromAction.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java index 6722722390..5ce4d43547 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromAction.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableFromAction extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java index 6b7e68defb..ac2c94c921 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.Callable; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableFromCallable extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java index fdf3523b2f..d368a04244 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; public final class CompletableFromObservable extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java index ca33d582c9..0e65777e3f 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class CompletableFromPublisher extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java similarity index 81% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromRunnable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java index 3ce78a167f..3dc275e0e1 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromRunnable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java @@ -11,14 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.disposables.Disposables; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableFromRunnable extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java index 251ae5c8f3..adee6c86f0 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; public final class CompletableFromSingle extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java similarity index 83% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java index d676437b96..5c6054306a 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Call a Supplier for each incoming CompletableObserver and signal completion or the thrown exception. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableFromUnsafeSource.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java index e3e60684f6..02857d4692 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableFromUnsafeSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; public final class CompletableFromUnsafeSource extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableHide.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java index 0e1828dccb..16708ee90e 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableHide.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java @@ -11,13 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.CompletableSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Hides the identity of the upstream Completable and its Disposable sent through onSubscribe. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableLift.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java index 25a08d5821..58356a73dd 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableLift extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMaterialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java index dfafdec310..129084898a 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMaterialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.internal.operators.mixed.MaterializeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.operators.mixed.MaterializeSingleObserver; /** * Turn the signal types of a Completable source into a single Notification of diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMerge.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMerge.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java index a052c72bd6..ba28e2b050 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMerge.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableMerge extends Completable { final Publisher source; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMergeArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java index 81185866cc..ec9c675210 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableMergeArray extends Completable { final CompletableSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java index 5629d9db4a..a3facef60c 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableMergeDelayErrorArray extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java index e6192a4e84..63786f6f0e 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeDelayErrorIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.completable.CompletableMergeDelayErrorArray.*; -import io.reactivex.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeDelayErrorArray.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; public final class CompletableMergeDelayErrorIterable extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableMergeIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java index 7c3cea6737..86c08d359c 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableMergeIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.Iterator; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableMergeIterable extends Completable { final Iterable sources; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableNever.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java index 73b52d54d2..8c11621a7c 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableNever.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; public final class CompletableNever extends Completable { public static final Completable INSTANCE = new CompletableNever(); diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableObserveOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java index b931ed4a5d..8bccc8ced0 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableObserveOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class CompletableObserveOn extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableOnErrorComplete.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java index 5ff0cc3235..6d87a4275e 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableOnErrorComplete.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; public final class CompletableOnErrorComplete extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletablePeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/completable/CompletablePeek.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java index 02180e4e91..04955c6931 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletablePeek.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.completable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletablePeek extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableResumeNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java index 5111d46f32..63227fb391 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableResumeNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class CompletableResumeNext extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableSubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java index 3b2b394694..f76ac93595 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableSubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; public final class CompletableSubscribeOn extends Completable { final CompletableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableTakeUntilCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableTakeUntilCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java index 7a27b68f9b..bd7e519a17 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableTakeUntilCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Terminates the sequence if either the main or the other Completable terminate. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableTimeout.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java index c11daa7342..1a38bb383a 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableTimeout extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableTimer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java index 4f1eae40c4..4e271af773 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableTimer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signals an {@code onComplete} event after the specified delay. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableToFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java index d8820a5a2a..ccbafd06b5 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableToFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.internal.observers.SubscriberCompletableObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.SubscriberCompletableObserver; public final class CompletableToFlowable extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableToObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java index f55a310b0a..91ce597c3b 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableToObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.BasicQueueDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; /** * Wraps a Completable and exposes it as an Observable. diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableToSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java index 30d5d6f1a6..c35d909796 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableToSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; public final class CompletableToSingle extends Single { final CompletableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/completable/CompletableUsing.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java index 07b2b3e653..ab29ce4ae8 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.completable; +package io.reactivex.rxjava3.internal.operators.completable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class CompletableUsing extends Completable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstream.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java index 2e6714196e..76a68d37b3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstream.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Publisher; -import io.reactivex.Flowable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.HasUpstreamPublisher; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher; /** * Abstract base class for operators that take an upstream diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java index af6613b224..811ced15f3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -19,12 +19,12 @@ import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; public final class BlockingFlowableIterable implements Iterable { final Flowable source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java index 55ef6c453c..91fce3e427 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.Semaphore; @@ -19,10 +19,10 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.DisposableSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.DisposableSubscriber; /** * Wait for and iterate over the latest values of the source observable. If the source works faster than the diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java index 298a3f21be..646ec7f2ab 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; -import io.reactivex.Flowable; -import io.reactivex.internal.util.*; -import io.reactivex.subscribers.DefaultSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.subscribers.DefaultSubscriber; /** * Returns an Iterable that always returns the item most recently emitted by an Observable, or a diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java index 8cd40288e4..4db920bb1f 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.*; @@ -19,10 +19,10 @@ import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.DisposableSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.DisposableSubscriber; /** * Returns an Iterable that blocks until the Observable emits another item, then returns that item. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAll.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java index 608089ace4..0933703803 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAll.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableAll extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAllSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java index 1ec3e9460d..516d37bf7c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAllSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java @@ -10,17 +10,17 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableAllSingle extends Single implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAmb.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java index 203c62f999..546beb0fae 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAmb.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableAmb extends Flowable { final Publisher[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAny.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java index aed50107e4..401d444cca 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAny.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableAny extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAnySingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java index 0c30c11107..6a9e4aacbb 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAnySingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java @@ -10,17 +10,17 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableAnySingle extends Single implements FuseToFlowable { final Flowable source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAutoConnect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableAutoConnect.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java index 619d551588..c8bb4a7d1a 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableAutoConnect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.disposables.Disposable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; /** * Wraps a {@link ConnectableFlowable} and calls its {@code connect()} method once diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableBlockingSubscribe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java index c5ac6884f6..899ae6c21c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBlockingSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.*; import org.reactivestreams.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.subscribers.*; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.internal.util.*; /** * Utility methods to consume a Publisher in a blocking manner with callbacks or Subscriber. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableBuffer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java index f77ad2d50e..0da3aea64e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBuffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableBuffer> extends AbstractFlowableWithUpstream { final int size; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java index 3398e201f7..62e11eb2c3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableBufferBoundary, Open, Close> extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferExactBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java index 68d3f10018..22d139eb89 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferExactBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.subscribers.QueueDrainSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.QueueDrainHelper; -import io.reactivex.subscribers.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.subscribers.*; public final class FlowableBufferExactBoundary, B> extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java index b656c0a93e..4057a06abb 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java @@ -11,26 +11,26 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.subscribers.QueueDrainSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.QueueDrainHelper; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableBufferTimed> extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java index 830b0984ac..aea0b3150d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * An observable which auto-connects to another observable, caches the elements diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCollect.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java index ea247ef56e..d5b4dd8233 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java @@ -10,16 +10,16 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableCollect extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCollectSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java index 39d45a3872..b48f4d11fc 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCollectSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java @@ -10,19 +10,19 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableCollectSingle extends Single implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCombineLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java index 9ff88699aa..70f7f313bc 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCombineLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.flowable.FlowableMap.MapSubscriber; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Combines the latest values from multiple sources through a function. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java index 4d7cd06c5b..ad1651b261 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java @@ -10,16 +10,16 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableConcatArray extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java index 176ca803ec..6aea36d5d2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java @@ -10,21 +10,21 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableConcatMap extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEager.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java index 9376833326..71f01437cd 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEager.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscribers.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableConcatMapEager extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java index 43785a6fc5..8b1e7ec68b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.internal.operators.flowable.FlowableConcatMapEager.ConcatMapEagerDelayErrorSubscriber; -import io.reactivex.internal.util.ErrorMode; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMapEager.ConcatMapEagerDelayErrorSubscriber; +import io.reactivex.rxjava3.internal.util.ErrorMode; /** * ConcatMapEager which works with an arbitrary Publisher source. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java index 48040fd3e7..8ee6afcd87 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java @@ -10,13 +10,13 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.internal.util.ErrorMode; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.util.ErrorMode; public final class FlowableConcatMapPublisher extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java index f3d6eb2258..41cda15f89 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatMapScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java @@ -10,22 +10,22 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.operators.flowable.FlowableConcatMap.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableConcatMapScheduler extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java index 8928d20139..16556a5892 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Subscribe to a main Flowable first, then when it completes normally, subscribe to a Completable diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java index 0081d91feb..92c65809c7 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; -import org.reactivestreams.*; +import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscribers.SinglePostCompleteSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Subscribe to a main Flowable first, then when it completes normally, subscribe to a Maybe, diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java index 23c60ea4fc..b1b65d9dbf 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; -import org.reactivestreams.*; +import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscribers.SinglePostCompleteSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Subscribe to a main Flowable first, then when it completes normally, subscribe to a Single, diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCount.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java index b29e2690a1..7858180b09 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCount.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; public final class FlowableCount extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCountSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java index c43f0314f0..517d026e3f 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCountSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableCountSingle extends Single implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java index caf6d31101..1ae39ef326 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Cancellable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableCreate extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounce.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java index 143e61ec55..53f3c4e833 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.*; public final class FlowableDebounce extends AbstractFlowableWithUpstream { final Function> debounceSelector; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounceTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java index 51d365e849..582c04c6e5 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounceTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableDebounceTimed extends AbstractFlowableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java similarity index 79% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDefer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java index 3ff5a18a3e..6117d56f92 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; public final class FlowableDefer extends Flowable { final Supplier> supplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDelay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java index 684c11f549..18950363e2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDelay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableDelay extends AbstractFlowableWithUpstream { final long delay; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOther.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOther.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java index ea52987d59..1ae7f8210e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOther.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delays the subscription to the main source until the other diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDematerialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java index 5fe5211834..d19bf4f037 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableDematerialize extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDetach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java index 7679ee152e..e3f266094e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDetach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.EmptyComponent; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.EmptyComponent; public final class FlowableDetach extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinct.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java index 860025040b..08e1060cc2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinct.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.QueueFuseable; -import io.reactivex.internal.subscribers.BasicFuseableSubscriber; -import io.reactivex.internal.subscriptions.EmptySubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueFuseable; +import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableDistinct extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChanged.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java index 4d4061a99e..f3ee070429 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChanged.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscribers.*; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscribers.*; public final class FlowableDistinctUntilChanged extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java index 378c01cf15..ed5d969328 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.*; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscribers.*; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscribers.*; /** * Calls a consumer after pushing the current item to the downstream. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDoFinally.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java index e6fbadd304..8cc70f171c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoFinally.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action after an onError, onComplete or a cancel event. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnEach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java index 0d8a63b19e..b6900b077e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnEach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscribers.*; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscribers.*; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableDoOnEach extends AbstractFlowableWithUpstream { final Consumer onNext; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java index 0c979d2918..687474a403 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableDoOnLifecycle extends AbstractFlowableWithUpstream { private final Consumer onSubscribe; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAt.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java index 9d3ead4a46..31c21e2552 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAt.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.NoSuchElementException; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableElementAt extends AbstractFlowableWithUpstream { final long index; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java index 3ef874d5b5..67f4744b76 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableElementAtMaybe extends Maybe implements FuseToFlowable { final Flowable source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java index e488724dac..3260307745 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableElementAtSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.NoSuchElementException; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableElementAtSingle extends Single implements FuseToFlowable { final Flowable source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java similarity index 83% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java index bc5bf36e81..4a9bbe7d32 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; /** * A source Flowable that signals an onSubscribe() + onComplete() only. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java index 2580ecfb43..cfb0a59ab3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; public final class FlowableError extends Flowable { final Supplier errorSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFilter.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java index aeeb21b799..52aac8e1f4 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFilter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscribers.*; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscribers.*; public final class FlowableFilter extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java index 23d490cf69..281339c5c0 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableFlatMap extends AbstractFlowableWithUpstream { final Function> mapper; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java index f2661e43b4..cb212f88b2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps a sequence of values into CompletableSources and awaits their termination. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java index 1a2eafc299..dd383052de 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; -import org.reactivestreams.*; - -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import org.reactivestreams.Subscription; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps a sequence of values into CompletableSources and awaits their termination. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java index aa46b7acd5..10b4b48978 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps upstream values into MaybeSources and merges their signals into one sequence. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java index b5e0f18fc0..0f5be8917d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; public final class FlowableFlatMapPublisher extends Flowable { final Publisher source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java index 9513736025..0ab30f15f8 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps upstream values into SingleSources and merges their signals into one sequence. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java index 24b4b5237c..808d964798 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableFlattenIterable extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java index d54fb15a21..0b49186290 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableFromArray extends Flowable { final T[] array; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java similarity index 81% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java index e54feffecf..7f918c5c51 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.Callable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableFromCallable extends Flowable implements Supplier { final Callable callable; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromFuture.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java index 102fdf8b34..7a814dafb2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromFuture.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.*; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; public final class FlowableFromFuture extends Flowable { final Future future; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java index e893dca7e8..c8dc87c0c3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableFromIterable extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java index 7ad4edb269..e88fd35c73 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; public final class FlowableFromObservable extends Flowable { private final Observable upstream; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java index 65dbb4eeab..df575a0274 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public final class FlowableFromPublisher extends Flowable { final Publisher publisher; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableFromSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java index e9a5bf9d53..bd714ee6c0 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Call a Supplier for each incoming Subscriber and signal the returned value or the thrown exception. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableGenerate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java index 51f6d78996..1370d2fa8a 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGenerate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableGenerate extends Flowable { final Supplier stateSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupBy.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java index 13941b6516..9da6e208b6 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupBy.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java @@ -11,28 +11,24 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import java.util.Map; -import java.util.Queue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.*; +import java.util.concurrent.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.flowables.GroupedFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.internal.util.EmptyComponent; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.flowables.GroupedFlowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableGroupBy extends AbstractFlowableWithUpstream> { final Function keySelector; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java index 7cf3adb7b8..213073c672 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.UnicastProcessor; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.UnicastProcessor; public final class FlowableGroupJoin extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableHide.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java index 0e5f7cc14f..512269f58f 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableHide.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Hides the identity of the wrapped Flowable and its Subscription. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElements.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java index 443baf3989..c30935c569 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElements.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class FlowableIgnoreElements extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java index fc59ae9d8e..e68e5dd784 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; -import org.reactivestreams.*; +import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableIgnoreElementsCompletable extends Completable implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableInternalHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java index e0ed2f374c..52cabd90bc 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableInternalHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java @@ -10,17 +10,17 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; /** * Helper utility class to support Flowable with inner classes. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableInterval.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java index 35a09373cc..44e735be37 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableInterval.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.schedulers.TrampolineScheduler; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableInterval extends Flowable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableIntervalRange.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java index 739460884b..83ff94ecaa 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableIntervalRange.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.schedulers.TrampolineScheduler; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableIntervalRange extends Flowable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java index 2bd33b64a3..591cdb159a 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java @@ -11,24 +11,24 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.operators.flowable.FlowableGroupJoin.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.CompositeDisposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableJoin extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableJust.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java index d243fbb744..d498befefc 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableJust.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.subscriptions.ScalarSubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription; /** * Represents a constant scalar value. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableLastMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java index e27efeb403..1c6a46f71c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLastMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Consumes the source Publisher and emits its last item or completes. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableLastSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java index 344c6f3668..7694067609 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLastSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.NoSuchElementException; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Consumes the source Publisher and emits its last item or the defaultItem diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableLift.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java index 5828b3d9e3..5f92e95652 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Allows lifting operators into a chain of Publishers. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLimit.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimit.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableLimit.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimit.java index 58004d0c69..7adef9983e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableLimit.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimit.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Limits both the total request amount and items received from the upstream. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java index 83d9cc79f1..cec093d278 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscribers.*; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscribers.*; public final class FlowableMap extends AbstractFlowableWithUpstream { final Function mapper; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMapNotification.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java index 8f9932442e..9998bee06b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscribers.SinglePostCompleteSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; public final class FlowableMapNotification extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMapPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java index 3378af4b15..159efcea6c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.functions.Function; -import io.reactivex.internal.operators.flowable.FlowableMap.MapSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber; /** * Map working with an arbitrary Publisher source. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMaterialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java index 91f58105ee..e3e23c18e5 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMaterialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.internal.subscribers.SinglePostCompleteSubscriber; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableMaterialize extends AbstractFlowableWithUpstream> { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java index 435b604b63..efb978083c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; /** * Merges a Flowable and a Completable by emitting the items of the Flowable and waiting until diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java index 8cd1c81220..49aa387dde 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Merges an Observable and a Maybe by emitting the items of the Observable and the success diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java index c27a90e594..9a2337c40f 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Merges an Observable and a Maybe by emitting the items of the Observable and the success diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableNever.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java index 2565fb396c..9dc0611920 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableNever.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; public final class FlowableNever extends Flowable { public static final Flowable INSTANCE = new FlowableNever(); diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableObserveOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java index 2053368ab6..6fe64c3ff8 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableObserveOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableObserveOn extends AbstractFlowableWithUpstream { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBuffer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java index 20caa2c7e3..4485174e29 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBuffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Action; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableOnBackpressureBuffer extends AbstractFlowableWithUpstream { final int bufferSize; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java index f11a520e7b..70b65ab39a 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Action; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Handle backpressure with a bounded buffer and custom strategy. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDrop.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDrop.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java index df5f4a7e86..8f3f2d4946 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDrop.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableOnBackpressureDrop extends AbstractFlowableWithUpstream implements Consumer { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java index f60c43bc31..10304a4b84 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableOnBackpressureError extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java index f981b738e6..b7ba9116a2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableOnBackpressureLatest extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java index 8fa826e08c..7a186cdec0 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableOnErrorNext extends AbstractFlowableWithUpstream { final Function> nextSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java index baf47d608a..df57dd5c00 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscribers.SinglePostCompleteSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber; public final class FlowableOnErrorReturn extends AbstractFlowableWithUpstream { final Function valueSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowablePublish.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java index 2ac2aea951..452dc83cce 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowablePublish.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Shares a single underlying connection to the upstream Publisher diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticast.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java index 46a2dbd7e3..cc36e86821 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Multicasts a Flowable over a selector function. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRange.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java index d4b6b50a59..9c14349eb9 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRange.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Emits a range of integer values. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRangeLong.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java index d641e6a285..8ae2f333ae 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRangeLong.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Emits a range of long values. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableReduce.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java index 67be1d18fd..4da1d68d99 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduces a sequence via a function into a single value or signals NoSuchElementException for diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java index 569dcdccf8..72b4f1ac28 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce a Flowable into a single value exposed as Single or signal NoSuchElementException. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceSeedSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java index bcd1042d48..cf489963ed 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceSeedSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce a sequence of values, starting from a seed value and by using diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java similarity index 81% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java index e814658522..ca8be6779e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.flowable.FlowableReduceSeedSingle.ReduceSeedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableReduceSeedSingle.ReduceSeedObserver; /** * Reduce a sequence of values, starting from a generated seed value and by using diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java index 414dfab8bb..e8f7f895ba 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Returns an observable sequence that stays connected to the source as long as diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeat.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java index 1bbdd7cd5c..092703b343 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeat.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableRepeat extends AbstractFlowableWithUpstream { final long count; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java index 9c7057af59..9e24575c58 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableRepeatUntil extends AbstractFlowableWithUpstream { final BooleanSupplier until; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatWhen.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java index b62254185d..021b4dd387 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.processors.*; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.processors.*; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableRepeatWhen extends AbstractFlowableWithUpstream { final Function, ? extends Publisher> handler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java similarity index 98% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableReplay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java index 5bac8ffda9..7b1009137a 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableReplay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.TimeUnit; @@ -19,18 +19,18 @@ import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.flowables.ConnectableFlowable; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.HasUpstreamPublisher; -import io.reactivex.internal.subscribers.SubscriberResourceWrapper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Timed; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.flowables.ConnectableFlowable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher; +import io.reactivex.rxjava3.internal.subscribers.SubscriberResourceWrapper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Timed; public final class FlowableReplay extends ConnectableFlowable implements HasUpstreamPublisher { /** The source observable. */ diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java index 8bc9ba27d0..1a06e02bb6 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableRetryBiPredicate extends AbstractFlowableWithUpstream { final BiPredicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java index 8d035aaf95..07d7207d74 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableRetryPredicate extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryWhen.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java index de0f735802..ff7ddb84af 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.flowable.FlowableRepeatWhen.*; -import io.reactivex.internal.subscriptions.EmptySubscription; -import io.reactivex.processors.*; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableRepeatWhen.*; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.processors.*; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableRetryWhen extends AbstractFlowableWithUpstream { final Function, ? extends Publisher> handler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSamplePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSamplePublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java index 66b9c48ec3..59a6ec3a14 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSamplePublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableSamplePublisher extends Flowable { final Publisher source; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSampleTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java index 47ed31f052..ea9a4d5ae2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSampleTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableSampleTimed extends AbstractFlowableWithUpstream { final long period; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableScalarXMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java index 8a9903ec4c..999cf48a51 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScalarXMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility classes to work with scalar-sourced XMap operators (where X == { flat, concat, switch }). diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableScan.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java index 0c5aca6bf6..3dadb2968b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScan.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableScan extends AbstractFlowableWithUpstream { final BiFunction accumulator; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableScanSeed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java index 13272256d7..c1875f3070 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableScanSeed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java @@ -10,21 +10,21 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableScanSeed extends AbstractFlowableWithUpstream { final BiFunction accumulator; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqual.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java index 237546a75b..0c825c9ded 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqual.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSequenceEqual extends Flowable { final Publisher first; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java index 5c53d8283a..b43377dd06 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.operators.flowable.FlowableSequenceEqual.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableSequenceEqual.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSequenceEqualSingle extends Single implements FuseToFlowable { final Publisher first; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSerialized.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java index fc4832aeb7..ec924bb0d1 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSerialized.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscriber; -import io.reactivex.Flowable; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableSerialized extends AbstractFlowableWithUpstream { public FlowableSerialized(Flowable source) { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java index 7b4ace56f0..11a27d372b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.NoSuchElementException; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSingle extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java index 14be53915a..1d701014cb 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSingleMaybe extends Maybe implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java index cb4bce53c5..50c4d06ccc 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSingleSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.NoSuchElementException; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSingleSingle extends Single implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSkip.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java index 58a0446b98..f60d36e8f1 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class FlowableSkip extends AbstractFlowableWithUpstream { final long n; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLast.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java index bbda349db2..8b3a6a2487 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.ArrayDeque; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class FlowableSkipLast extends AbstractFlowableWithUpstream { final int skip; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java index 0ffd249f15..099c5ec59c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableSkipLastTimed extends AbstractFlowableWithUpstream { final long time; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java index 0324c720a2..8052bc7fbf 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; public final class FlowableSkipUntil extends AbstractFlowableWithUpstream { final Publisher other; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipWhile.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java index 8123be6782..7ed91df231 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSkipWhile.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class FlowableSkipWhile extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java index f603aca819..63394a09ab 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Subscribes to the source Flowable on the specified Scheduler and makes diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java index be8febdf17..a2e81eac58 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionArbiter; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter; public final class FlowableSwitchIfEmpty extends AbstractFlowableWithUpstream { final Publisher other; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java index 7deccd3e12..e146117c1d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableSwitchMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableSwitchMap extends AbstractFlowableWithUpstream { final Function> mapper; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTake.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java index 5d33c14523..dc07922aa7 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTake.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableTake extends AbstractFlowableWithUpstream { final long limit; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLast.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java index 60318d0b08..5252bd808d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.ArrayDeque; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableTakeLast extends AbstractFlowableWithUpstream { final int count; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOne.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java index 570bf3c823..fb11b74c0c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOne.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.*; public final class FlowableTakeLastOne extends AbstractFlowableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java index b48cdddc0b..2538fc178e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; public final class FlowableTakeLastTimed extends AbstractFlowableWithUpstream { final long count; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakePublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java index a79501dccf..bda003e7da 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakePublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.internal.operators.flowable.FlowableTake.TakeSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableTake.TakeSubscriber; /** * Take with a generic Publisher source. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java index 180a77ec68..1bbe14cd57 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; public final class FlowableTakeUntil extends AbstractFlowableWithUpstream { final Publisher other; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java index cad253b254..8bb8f27531 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableTakeUntilPredicate extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeWhile.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java index d4436bd0a0..ba9a115da8 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTakeWhile.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableTakeWhile extends AbstractFlowableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java index ca10e8d47c..4b1441b731 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableThrottleFirstTimed extends AbstractFlowableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java index b3fe22e129..fe32addcc6 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Emits the next or latest item when the given time elapses. diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeInterval.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java index cf8b7087a7..4f7c1e899b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeInterval.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.schedulers.Timed; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.schedulers.Timed; public final class FlowableTimeInterval extends AbstractFlowableWithUpstream> { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeout.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java index 8363a5d0cb..b45755fc30 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.flowable.FlowableTimeoutTimed.TimeoutSupport; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableTimeoutTimed.TimeoutSupport; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableTimeout extends AbstractFlowableWithUpstream { final Publisher firstTimeoutIndicator; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java index d25acdc3e3..8963788992 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.concurrent.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableTimeoutTimed extends AbstractFlowableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableTimer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java index 7c829267cf..6c172320de 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableTimer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class FlowableTimer extends Flowable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableToList.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java index 3b0daf30cd..da395c09d2 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableToList.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; public final class FlowableToList> extends AbstractFlowableWithUpstream { final Supplier collectionSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableToListSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java index bd5b02073b..dd5aac30e1 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableToListSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Collection; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.FuseToFlowable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.ArrayListSupplier; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.ArrayListSupplier; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableToListSingle> extends Single implements FuseToFlowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java index 0790d4b444..3a7d29a47b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableUnsubscribeOn extends AbstractFlowableWithUpstream { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java index b25490fd24..9c0dc74d4c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.AtomicBoolean; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableUsing extends Flowable { final Supplier resourceSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java index e9c1259b65..e3a104662b 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindow.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.ArrayDeque; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.UnicastProcessor; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.UnicastProcessor; public final class FlowableWindow extends AbstractFlowableWithUpstream> { final long size; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java index a398eb040f..e6f70107da 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.UnicastProcessor; -import io.reactivex.subscribers.DisposableSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.UnicastProcessor; +import io.reactivex.rxjava3.subscribers.DisposableSubscriber; public final class FlowableWindowBoundary extends AbstractFlowableWithUpstream> { final Publisher other; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundarySelector.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java index d9d6ffa517..573f0257e9 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowBoundarySelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java @@ -11,27 +11,27 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.Flowable; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.subscribers.QueueDrainSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.NotificationLite; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.processors.UnicastProcessor; -import io.reactivex.subscribers.*; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.NotificationLite; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.processors.UnicastProcessor; +import io.reactivex.rxjava3.subscribers.*; public final class FlowableWindowBoundarySelector extends AbstractFlowableWithUpstream> { final Publisher open; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java index ae284ef27a..d7c3e66e3d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java @@ -11,25 +11,25 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.*; import java.util.concurrent.TimeUnit; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.subscribers.QueueDrainSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.NotificationLite; -import io.reactivex.processors.UnicastProcessor; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.NotificationLite; +import io.reactivex.rxjava3.processors.UnicastProcessor; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableWindowTimed extends AbstractFlowableWithUpstream> { final long timespan; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFrom.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java index 00017d431d..c3ec3ab5f9 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFrom.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.subscribers.SerializedSubscriber; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.subscribers.SerializedSubscriber; public final class FlowableWithLatestFrom extends AbstractFlowableWithUpstream { final BiFunction combiner; diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromMany.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java index d42d9693e9..7c3b06ed8c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromMany.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java @@ -10,22 +10,22 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Arrays; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Combines a main sequence of values with the latest from multiple other sequences via diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableZip.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java index b8516a93e9..0d080330a9 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableZip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Arrays; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableZip extends Flowable { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/flowable/FlowableZipIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java index 7a81c2dcba..fad3df6e8e 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.flowable; +package io.reactivex.rxjava3.internal.operators.flowable; import java.util.Iterator; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class FlowableZipIterable extends AbstractFlowableWithUpstream { final Iterable other; diff --git a/src/main/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstream.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java index 7daf5ffbde..ed559c96dc 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstream.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; /** * Abstract base class for intermediate Maybe operators that take an upstream MaybeSource. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeAmb.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java index 8efc69b24b..b87390e847 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeAmb.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signals the event of the first MaybeSource that signals. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeCache.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java index c8adbd7ab8..64d57a0605 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCache.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * Consumes the source once and replays its signal to any current or future MaybeObservers. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java index 9dc56e137f..774511f291 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.MaybeObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.MaybeObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * MaybeObserver that delegates the onSuccess, onError and onComplete method calls to callbacks. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java index 0584c47b45..bab81330b2 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; /** * Concatenate values of each MaybeSource provided in an array. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayDelayError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayDelayError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java index 3118ea30bf..2e04f7c733 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayDelayError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Concatenate values of each MaybeSource provided in an array and delays diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java index 353afadf83..b01b58c6a0 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeConcatIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; /** * Concatenate values of each MaybeSource provided by an Iterable. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeContains.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java index aa167b2a08..55b68fec3d 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeContains.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; /** * Signals true if the source signals a value that is object-equals with the provided diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeCount.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java index df36c7d755..d687e6ac1e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCount.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; /** * Signals 1L if the source signalled an item or 0L if the source is empty. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java index e328a2b3c7..bfa6a9444e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Cancellable; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Provides an API over MaybeObserver that serializes calls to onXXX and manages cancellation diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDefer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java index f48b274d10..3146b4781d 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Defers the creation of the actual Maybe the incoming MaybeObserver is subscribed to. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDelay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java index 68a1508195..8509d90ab4 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Delays all signal types by the given amount and re-emits them on the given scheduler. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java index d3a0f783e2..0e3e8758fe 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Delay the emission of the main signal until the other signals an item or completes. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java index c29fb3fc0a..09851e4af8 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delay the subscription to the main Maybe until the other signals an item or completes. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java index da9ff60e81..65a9460ec0 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java @@ -11,17 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.CompletableObserver; -import io.reactivex.CompletableSource; -import io.reactivex.Maybe; -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +package io.reactivex.rxjava3.internal.operators.maybe; + import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; + public final class MaybeDelayWithCompletable extends Maybe { final MaybeSource source; diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDetach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java index c6da27b3bd..9c4e4b9070 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDetach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Breaks the references between the upstream and downstream when the Maybe terminates. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccess.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java index e87790321f..939f817ac9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccess.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.maybe; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a consumer after pushing the current item to the downstream. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDoFinally.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java index 7b5573661f..eaeae0234f 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoFinally.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action after an onSuccess, onError, onComplete or a dispose event. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnEvent.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java index 4769ee79f4..c70397473b 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnEvent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiConsumer; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiConsumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Calls a BiConsumer with the success, error values of the upstream Maybe or with two nulls if diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java index 81d0d8af34..7443b147a0 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java @@ -11,15 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.Maybe; -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; +package io.reactivex.rxjava3.internal.operators.maybe; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Action; public final class MaybeDoOnTerminate extends Maybe { diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java index 150770cb01..4b3361998e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Signals an onComplete. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeEqualSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java index f5f83fbcfc..e1e7e9fcbf 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeEqualSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Compares two MaybeSources to see if they are both empty or emit the same value compared diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java index 6036992efd..a850a27b6d 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; /** * Signals a constant Throwable. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeErrorCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeErrorCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java index b480a01478..f60e749700 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeErrorCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Signals a Throwable returned by a Supplier. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFilter.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java index 763ad258e0..a8c4f12176 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFilter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Filters the upstream via a predicate, returning the success item or completing if diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFilterSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFilterSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java index 820bc8b7ae..ff8e71b745 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFilterSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Filters the upstream SingleSource via a predicate, returning the success item or completing if diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelector.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java index 2b9b8ec339..c463567227 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a source item to another MaybeSource then calls a BiFunction with the diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java index aa0a7f93bc..7ad1008421 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source MaybeSource into a Completable. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java index f4d174d924..9c8aef2ba9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Maps a success value into an Iterable and streams it back as a Flowable. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java index 5513eb5e8f..8c2b4816c9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Iterator; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; /** * Maps a success value into an Iterable and streams it back as a Flowable. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotification.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java index fa1c6cd3fc..39007e5117 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a value into a MaybeSource and relays its signal. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java index af55a7a57d..011cbd9ab7 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java @@ -11,21 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.maybe; + import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; + /** * Maps the success value of the source MaybeSource into a Single. * @param the input value type diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElement.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java index 37795729b8..e823b06936 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElement.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source MaybeSource into a Single. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatten.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatten.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java index 3df8b986ad..837ba675ef 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFlatten.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps a value into a MaybeSource and relays its signal. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromAction.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java index ec9ddd11fa..8c29290deb 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromAction.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Executes an Action and signals its exception or completes normally. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java index c8f81e3fed..4d218eb1ad 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.Callable; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Executes a callable and signals its value as success or signals an exception. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java index 2753d992da..bdbc2ec03b 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamCompletableSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamCompletableSource; /** * Wrap a Single into a Maybe. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromFuture.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java index 7a206007aa..db6c87518e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromFuture.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; /** * Waits until the source Future completes or the wait times out; treats a {@code null} diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromRunnable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java index d38e8f497f..672bd4edf5 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromRunnable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Executes an Runnable and signals its exception or completes normally. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java index b610a06a12..7ea38ea986 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamSingleSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamSingleSource; /** * Wrap a Single into a Maybe. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java index 2f33813898..52aba416d9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Executes a supplier and signals its value as success or signals an exception. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeHide.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java index 805f7cdc0d..2950734c37 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeHide.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Hides the identity of the upstream Maybe and its Disposable sent through onSubscribe. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElement.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java index 000de8cf0e..8750bc4f7e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElement.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Turns an onSuccess into an onComplete, onError and onComplete is relayed as is. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java index ac49d66e04..4b2ea8d462 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToMaybe; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToMaybe; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Turns an onSuccess into an onComplete, onError and onComplete is relayed as is. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java index 642dc641ce..83ec1d278a 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signals true if the source Maybe signals onComplete, signals false if the source Maybe diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java index c8acdff348..c2f3bf4428 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signals true if the source Maybe signals onComplete, signals false if the source Maybe diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeJust.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java index d93c8277db..a2c70740a6 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeJust.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; /** * Signals a constant value. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeLift.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java index 6d3324739a..38cb73972c 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Calls a MaybeOperator for the incoming MaybeObserver. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java index 7d7c7a47b5..c2a14f994d 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.maybe; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the upstream success value into some other value. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeMaterialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java index 9d3756f01b..02e6691578 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMaterialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.internal.operators.mixed.MaterializeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.operators.mixed.MaterializeSingleObserver; /** * Turn the signal types of a Maybe source into a single Notification of diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeMergeArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java index c0f5a89cbf..53c4e18cf3 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeMergeArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.*; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Run all MaybeSources of an array at once and signal their values as they become available. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeNever.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java index 834dccac9b..9690c28359 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeNever.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; /** * Doesn't signal any event other than onSubscribe. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeObserveOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java index cce201fedb..0bf89494e9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeObserveOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signals the onSuccess, onError or onComplete events on a the specific scheduler. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorComplete.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java index 10fe0610bc..cd82570f58 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorComplete.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Emits an onComplete if the source emits an onError and the predicate returns true for diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java index f7fff884ad..15ec49c3a9 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Subscribes to the MaybeSource returned by a function if the main source signals an onError. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorReturn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java index 568f15009a..5c61179678 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.maybe; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Returns a value generated via a function if the main source signals an onError. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybePeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybePeek.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java index 1d6179abf4..1b4b717367 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybePeek.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.maybe; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Peeks into the lifecycle of a Maybe and MaybeObserver. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java index da2ba08070..8a934d5216 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; /** * Subscribes to the upstream MaybeSource on the specified scheduler. * diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java index 68d3db37d7..e1b218078e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Subscribes to the other source if the main source is empty. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java index bd94beb3ea..3533092a14 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; + /** * Subscribes to the other source if the main source is empty. * diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java index 56a5cac4f7..9b53acf077 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Relays the main source's event unless the other Maybe signals an item first or just completes diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java index 656cf473b5..0ef77d40e2 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Relays the main source's event unless the other Publisher signals an item first or just completes diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java index 83d22cf232..aee0b524c2 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Switches to the fallback Maybe if the other MaybeSource signals a success or completes, or diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java index f0d690d567..ae1a2efd18 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Switches to the fallback Maybe if the other Publisher signals a success or completes, or diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeTimer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java index 5d2c1c4151..a374c44ced 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeTimer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signals a {@code 0L} after the specified delay. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeToFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java index c477a86b50..11b713265d 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Wraps a MaybeSource and exposes it as a Flowable, relaying signals in a backpressure-aware manner diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeToObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java index 8caa294718..75129b3514 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; -import io.reactivex.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; /** * Wraps a MaybeSource and exposes it as an Observable, relaying signals in a backpressure-aware manner diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeToPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java index b53052267f..b6552e9726 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import org.reactivestreams.Publisher; -import io.reactivex.MaybeSource; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.MaybeSource; +import io.reactivex.rxjava3.functions.Function; /** * Helper function to merge/concat values of each MaybeSource provided by a Publisher. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeToSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java index 146bbb23f8..c620cef68e 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeToSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.NoSuchElementException; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource; /** * Wraps a MaybeSource and exposes its onSuccess and onError signals and signals diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsafeCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsafeCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java index c607811706..35621c1bbf 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsafeCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; /** * Wraps a MaybeSource without safeguard and calls its subscribe() method for each MaybeObserver. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java index a6afe4c51a..6e29ffa610 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Makes sure a dispose() call from downstream happens on the specified scheduler. diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeUsing.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java index d2e499c9ed..628c4dda23 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Creates a resource and a dependent Maybe for each incoming Observer and optionally diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeZipArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java index ce8ed0048a..9d83976966 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeZipArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class MaybeZipArray extends Maybe { diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/maybe/MaybeZipIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java index 244e42a36e..efcd10b136 100644 --- a/src/main/java/io/reactivex/internal/operators/maybe/MaybeZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.maybe; +package io.reactivex.rxjava3.internal.operators.maybe; import java.util.Arrays; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.maybe.MaybeZipArray.ZipCoordinator; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.maybe.MaybeZipArray.ZipCoordinator; public final class MaybeZipIterable extends Maybe { diff --git a/src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java index 454c45b4c1..28bdae282a 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * After Completable completes, it relays the signals diff --git a/src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java index 70c397402e..c9017d0af6 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * After Completable completes, it relays the signals diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java index 68ce47c9d1..a37bba09dd 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java index 63018f0797..bfff35cf91 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each upstream item into a {@link MaybeSource}, subscribes to them one after the other terminates diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java index 1c76d2f808..918c4a1d73 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each upstream item into a {@link SingleSource}, subscribes to them one after the other terminates diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java index 0979194f28..f58eb90688 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream values into {@link CompletableSource}s, subscribes to the newer one while diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java index 0087a597d0..be9d06c66c 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link MaybeSource}s and switches (subscribes) to the newer ones diff --git a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java index 1d26e9964a..b37ba93b15 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link SingleSource}s and switches (subscribes) to the newer ones diff --git a/src/main/java/io/reactivex/internal/operators/mixed/MaterializeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/mixed/MaterializeSingleObserver.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java index ea9e2a1344..551b32d4b1 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/MaterializeSingleObserver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A consumer that implements the consumer types of Maybe, Single and Completable diff --git a/src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java index 533e00addd..a4dde1242f 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of a Maybe onto an ObservableSource and diff --git a/src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java index 2bd7b18f2e..66a446f3f3 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * Maps the success value of a Maybe onto a Publisher and diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java index 900108866a..993e315df4 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java index 273b0cae9c..cba6f9a4e1 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each upstream item into a {@link MaybeSource}, subscribes to them one after the other terminates diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java index 9c3576154b..30028d813d 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each upstream item into a {@link SingleSource}, subscribes to them one after the other terminates diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java index 02c70482b9..2b23d4397d 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream values into {@link CompletableSource}s, subscribes to the newer one while diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java index f7d5c877ee..99cc745b5a 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link MaybeSource}s and switches (subscribes) to the newer ones diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java index 5fd19dc658..ba7ffa359f 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps the upstream items into {@link SingleSource}s and switches (subscribes) to the newer ones diff --git a/src/main/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java index d8ae77f8df..24f231e45c 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.maybe.MaybeToObservable; -import io.reactivex.internal.operators.single.SingleToObservable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.maybe.MaybeToObservable; +import io.reactivex.rxjava3.internal.operators.single.SingleToObservable; /** * Utility class to extract a value from a scalar source reactive type, diff --git a/src/main/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java index 48d5793185..9591783a8e 100644 --- a/src/main/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.mixed; +package io.reactivex.rxjava3.internal.operators.mixed; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of a Single onto an ObservableSource and diff --git a/src/main/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstream.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java index c2da840509..2225cb2d2a 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstream.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.internal.fuseable.HasUpstreamObservableSource; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource; /** * Base class for operators with a source consumable. diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/BlockingObservableIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java index 3fdd26f9b6..b190896f2b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.*; -import io.reactivex.ObservableSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; public final class BlockingObservableIterable implements Iterable { final ObservableSource source; @@ -42,7 +42,7 @@ public Iterator iterator() { static final class BlockingObservableIterator extends AtomicReference - implements io.reactivex.Observer, Iterator, Disposable { + implements io.reactivex.rxjava3.core.Observer, Iterator, Disposable { private static final long serialVersionUID = 6695226475494099826L; diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java index 471e695fb7..aaa975dbf7 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.internal.util.*; -import io.reactivex.observers.DisposableObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observers.DisposableObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wait for and iterate over the latest values of the source observable. If the source works faster than the diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java index 90a603f65c..246c4e327f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; -import io.reactivex.ObservableSource; -import io.reactivex.internal.util.*; -import io.reactivex.observers.DefaultObserver; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observers.DefaultObserver; /** * Returns an Iterable that always returns the item most recently emitted by an Observable, or a @@ -74,15 +74,15 @@ public void onNext(T args) { } /** - * The {@link Iterator} return is not thread safe. In other words don't call {@link Iterator#hasNext()} in one - * thread expect {@link Iterator#next()} called from a different thread to work. + * The {@link MostRecentIterator} return is not thread safe. In other words don't call {@link MostRecentIterator#hasNext()} in one + * thread expect {@link MostRecentIterator#next()} called from a different thread to work. * @return the Iterator */ - public Iterator getIterable() { - return new Iterator(); + public MostRecentIterator getIterable() { + return new MostRecentIterator(); } - final class Iterator implements java.util.Iterator { + final class MostRecentIterator implements java.util.Iterator { /** * buffer to make sure that the state of the iterator doesn't change between calling hasNext() and next(). */ diff --git a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/BlockingObservableNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java index 33d7b6525c..1d5cca354b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/BlockingObservableNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.internal.util.*; -import io.reactivex.observers.DisposableObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observers.DisposableObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Returns an Iterable that blocks until the Observable emits another item, then returns that item. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java index 2349ce4893..a28da3650d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAll.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableAll extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAllSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java index 1fb756233d..db004ef966 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAllSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableAllSingle extends Single implements FuseToObservable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java index 2ed4fcd93b..adb85e3d71 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAmb.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableAmb extends Observable { final ObservableSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java index c1500c3fb6..69d3298d40 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAny.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableAny extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAnySingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java index b8c7001ed5..d3c3e495a5 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAnySingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableAnySingle extends Single implements FuseToObservable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableAutoConnect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableAutoConnect.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java index ebb6a49e07..393a9a3f94 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableAutoConnect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.observables.ConnectableObservable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.observables.ConnectableObservable; /** * Wraps a ConnectableObservable and calls its connect() method once diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableBlockingSubscribe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java index 589b71c5f9..c35f927c0b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBlockingSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.*; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.observers.*; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.observers.*; +import io.reactivex.rxjava3.internal.util.*; /** * Utility methods to consume an Observable in a blocking manner with callbacks or Observer. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java index 701d8006ab..316cf3aa21 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBuffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class ObservableBuffer> extends AbstractObservableWithUpstream { final int count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java index 466c15127f..63677b1a18 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableBufferBoundary, Open, Close> extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java index 0a970c0c40..474e993653 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferExactBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.QueueDrainObserver; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.util.QueueDrainHelper; -import io.reactivex.observers.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.observers.*; public final class ObservableBufferExactBoundary, B> extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java index d777938146..107b011b2d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableBufferTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java @@ -11,24 +11,24 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Observer; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.QueueDrainObserver; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.util.QueueDrainHelper; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableBufferTimed> extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java similarity index 98% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCache.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java index fdc3477b75..d03ad2008e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCache.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; /** * An observable which auto-connects to another observable, caches the elements diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java index c0e9444d50..3b81a32ad9 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableCollect extends AbstractObservableWithUpstream { final Supplier initialSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCollectSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java index e08dae6352..a63812a9ab 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCollectSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableCollectSingle extends Single implements FuseToObservable { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java index ccbfc8e6d3..6831cb3e9e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCombineLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableCombineLatest extends Observable { final ObservableSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java index 56ba37365f..6707d38f2b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java @@ -10,21 +10,21 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.observers.SerializedObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observers.SerializedObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableConcatMap extends AbstractObservableWithUpstream { final Function> mapper; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapEager.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java index 725d6895a7..132ed90682 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapEager.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.ArrayDeque; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.observers.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableConcatMapEager extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java index 5039371bb8..70b115dabb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java @@ -10,21 +10,21 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.*; -import io.reactivex.observers.SerializedObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observers.SerializedObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableConcatMapScheduler extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java index 5609455b33..333428a80b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Subscribe to a main Observable first, then when it completes normally, subscribe to a Single, diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java index ee0f5b9799..7f3d8d8716 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Subscribe to a main Observable first, then when it completes normally, subscribe to a Maybe, diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java index f3548e68a0..3c91beb30f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Subscribe to a main Observable first, then when it completes normally, subscribe to a Single, diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java index bae08e040b..f7ab3b012f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCount.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableCount extends AbstractObservableWithUpstream { public ObservableCount(ObservableSource source) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCountSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java index 6e534b0dcc..84042bfbea 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCountSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableCountSingle extends Single implements FuseToObservable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java index 03ba3f1186..7d44ca2c45 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java @@ -10,19 +10,19 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Cancellable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.fuseable.SimpleQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.fuseable.SimpleQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableCreate extends Observable { final ObservableOnSubscribe source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java index db8b9d4794..d2e1f8cf18 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.internal.functions.ObjectHelper; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.observers.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.observers.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableDebounce extends AbstractObservableWithUpstream { final Function> debounceSelector; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java index 49f490924a..626fe77928 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDebounceTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.observers.SerializedObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableDebounceTimed extends AbstractObservableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java index b0b6e9052e..c1f8dc41ab 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class ObservableDefer extends Observable { final Supplier> supplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java index 8c07ed6878..61e424a3eb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableDelay extends AbstractObservableWithUpstream { final long delay; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java index c6aff6e42c..c594c68b00 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Delays the subscription to the main source until the other diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java index 2f864152ee..59da21cd47 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableDematerialize extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDetach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java index 897ac02ebd..7665a6b4f8 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDetach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.EmptyComponent; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.EmptyComponent; /** * Breaks the links between the upstream and the downstream (the Disposable and diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java index dcc45fbd88..9274032f12 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicFuseableObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableDistinct extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChanged.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java index 1c322ea1e6..a36e92a3c4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChanged.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.*; -import io.reactivex.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; public final class ObservableDistinctUntilChanged extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDoAfterNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java index 34515c92d0..212b84fccc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoAfterNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; /** * Calls a consumer after pushing the current item to the downstream. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDoFinally.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java index 552a9f1edf..e5087d0ee4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoFinally.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.BasicIntQueueDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action after an onError, onComplete or a dispose event. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java index a88218cbd5..bbc34fed83 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnEach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableDoOnEach extends AbstractObservableWithUpstream { final Consumer onNext; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnLifecycle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java index cc4a06874a..b59cfdca64 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDoOnLifecycle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.*; -import io.reactivex.internal.observers.DisposableLambdaObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.observers.DisposableLambdaObserver; public final class ObservableDoOnLifecycle extends AbstractObservableWithUpstream { private final Consumer onSubscribe; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java index 5897fddfed..28ff883d03 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAt.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.NoSuchElementException; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableElementAt extends AbstractObservableWithUpstream { final long index; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java index 921edd6ab3..ad987cccd2 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableElementAtMaybe extends Maybe implements FuseToObservable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java index 7de1fa7bef..397e678265 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableElementAtSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.FuseToObservable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.NoSuchElementException; -import io.reactivex.plugins.RxJavaPlugins; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableElementAtSingle extends Single implements FuseToObservable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java index 149c5bd24d..d4869b70ea 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java @@ -10,12 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; public final class ObservableEmpty extends Observable implements ScalarSupplier { public static final Observable INSTANCE = new ObservableEmpty(); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java index 44e5d8bbfe..bbb88b13bc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class ObservableError extends Observable { final Supplier errorSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java index 74dace8416..3bbacc6250 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; public final class ObservableFilter extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java index a3c9fb63cc..0d8c124f83 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.*; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.*; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableFlatMap extends AbstractObservableWithUpstream { final Function> mapper; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java index 0f923106d7..a523757277 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicIntQueueDisposable; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps a sequence of values into CompletableSources and awaits their termination. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java index b9a3040656..5b9cb76ccb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps a sequence of values into CompletableSources and awaits their termination. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java index ca655680c7..1cf9d3799f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps upstream values into MaybeSources and merges their signals into one sequence. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java index ef6648cea0..507f45ea70 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps upstream values into SingleSources and merges their signals into one sequence. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFlattenIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java index 74b1839bb8..c6704398a1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFlattenIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Iterator; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps a sequence into an Iterable and emits its values. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java index 9a04a4fcc3..7c4b09ba62 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; public final class ObservableFromArray extends Observable { final T[] array; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java index 554d504675..486afaebf2 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.Callable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.DeferredScalarDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a Callable and emits its resulting single value or signals its exception. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromFuture.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java index ec6e90275d..b530f8280d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromFuture.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; public final class ObservableFromFuture extends Observable { final Future future; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java index f937f4ded5..91811b3c4a 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Iterator; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable; public final class ObservableFromIterable extends Observable { final Iterable source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java index 27b4305c89..14efd74eba 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java @@ -10,13 +10,13 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class ObservableFromPublisher extends Observable { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java index 88791276c8..63fa39be0e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.DeferredScalarDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a Supplier and emits its resulting single value or signals its exception. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableFromUnsafeSource.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java index 81a6a70332..d34423bcd4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableFromUnsafeSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; public final class ObservableFromUnsafeSource extends Observable { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableGenerate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java index 39aaff01f0..9c484e3957 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableGenerate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableGenerate extends Observable { final Supplier stateSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java index 0c0390a107..77eb93a870 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupBy.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java @@ -11,21 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.internal.functions.ObjectHelper; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.observables.GroupedObservable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.observables.GroupedObservable; public final class ObservableGroupBy extends AbstractObservableWithUpstream> { final Function keySelector; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java index 23e39af881..b6c9f811f4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableGroupJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.UnicastSubject; public final class ObservableGroupJoin extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableHide.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java index 6685146fcb..b929da4f78 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableHide.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Hides the identity of the wrapped ObservableSource and its Disposable. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java index b609cdee0c..a633c80dbb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElements.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; public final class ObservableIgnoreElements extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java index 15b3789e18..f19ea85008 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableIgnoreElementsCompletable extends Completable implements FuseToObservable { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java index 10927c39c7..3b589e3dd1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableInternalHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; -import io.reactivex.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.*; -import io.reactivex.observables.ConnectableObservable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.observables.ConnectableObservable; /** * Helper utility class to support Observable with inner classes. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableInterval.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java index 947a3941fa..93fee0973d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableInterval.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.schedulers.TrampolineScheduler; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler; public final class ObservableInterval extends Observable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableIntervalRange.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java index 5d48d1d3d0..96d113663e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableIntervalRange.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.schedulers.TrampolineScheduler; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler; public final class ObservableIntervalRange extends Observable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java index 9a293ca7d5..cf98732637 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.observable.ObservableGroupJoin.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.observable.ObservableGroupJoin.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableJoin extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java similarity index 81% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java index e006868eae..0fe64a5291 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableJust.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.internal.fuseable.ScalarSupplier; -import io.reactivex.internal.operators.observable.ObservableScalarXMap.ScalarDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; +import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable; /** * Represents a constant scalar value. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableLastMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java index d6b0da18d0..79457e0e80 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableLastMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Consumes the source ObservableSource and emits its last item, the defaultItem diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableLastSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java index b1355f2ca5..2ba8f28856 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableLastSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.NoSuchElementException; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Consumes the source ObservableSource and emits its last item, the defaultItem diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java index 8cdd918564..f38ac66bd3 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Allows lifting operators into a chain of Observables. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java index 724083356f..9bff5de703 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicFuseableObserver; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver; public final class ObservableMap extends AbstractObservableWithUpstream { final Function function; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java index b7526db5f4..8ef5a5395d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMapNotification.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class ObservableMapNotification extends AbstractObservableWithUpstream> { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java index 9cfe82b16a..6041961bcb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMaterialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableMaterialize extends AbstractObservableWithUpstream> { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java index 444ac38189..6d022ebf62 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.*; /** * Merges an Observable and a Completable by emitting the items of the Observable and waiting until diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java index 3dac3fdae9..3860207f63 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Merges an Observable and a Maybe by emitting the items of the Observable and the success diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java index 7574eaf3ba..d2ed340509 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Merges an Observable and a Single by emitting the items of the Observable and the success diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java similarity index 84% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableNever.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java index db8491338c..dd476d5993 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableNever.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java @@ -10,11 +10,10 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; public final class ObservableNever extends Observable { public static final Observable INSTANCE = new ObservableNever(); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java index 5a159feaf4..f36325e8d0 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableObserveOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.observers.BasicIntQueueDisposable; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.schedulers.TrampolineScheduler; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableObserveOn extends AbstractObservableWithUpstream { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java index c670ca8d8e..093e8d1299 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.SequentialDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableOnErrorNext extends AbstractObservableWithUpstream { final Function> nextSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java index b91e364856..df868ab410 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableOnErrorReturn extends AbstractObservableWithUpstream { final Function valueSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java index dc5358021e..629945369e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublish.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.fuseable.HasUpstreamObservableSource; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Shares a single underlying connection to the upstream ObservableSource diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublishSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservablePublishSelector.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java index 17824fb4ca..ef7d2367fc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservablePublishSelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.subjects.PublishSubject; /** * Shares a source Observable for the duration of a selector function. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRange.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java index 19cb08cc21..2b845fec51 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRange.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; /** * Emits a range of integer values from start to end. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRangeLong.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java index 55d23d28f1..2a4122ccad 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRangeLong.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; public final class ObservableRangeLong extends Observable { private final long start; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableReduceMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java index 63d0e6c2d1..24d5e5d568 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce a sequence of values into a single value via an aggregator function and emit the final value or complete diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableReduceSeedSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java index 6a11b91631..4ec8ac8bcc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceSeedSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce a sequence of values, starting from a seed value and by using diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableReduceWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java index 7d7d0061f6..e7b1b16813 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableReduceWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.observable.ObservableReduceSeedSingle.ReduceSeedObserver; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.observable.ObservableReduceSeedSingle.ReduceSeedObserver; /** * Reduce a sequence of values, starting from a generated seed value and by using diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRefCount.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java index 57d99325e6..f0b9157204 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRefCount.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.*; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Returns an observable sequence that stays connected to the source as long as diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRepeat.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java index a42a8e85f6..ad9159137c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeat.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class ObservableRepeat extends AbstractObservableWithUpstream { final long count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java index 485eb1f51f..60637fe802 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class ObservableRepeatUntil extends AbstractObservableWithUpstream { final BooleanSupplier until; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatWhen.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java index 24725997d1..abdf42b872 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRepeatWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.*; -import io.reactivex.subjects.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.subjects.*; /** * Repeatedly subscribe to a source if a handler ObservableSource signals an item. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java similarity index 98% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java index 674ab2f5b4..1bb4f344d4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java @@ -11,25 +11,25 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.HasUpstreamObservableSource; -import io.reactivex.internal.util.*; -import io.reactivex.observables.ConnectableObservable; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Timed; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.observables.ConnectableObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Timed; public final class ObservableReplay extends ConnectableObservable implements HasUpstreamObservableSource { /** The source observable. */ diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java index f762142f0b..48edbdaa26 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class ObservableRetryBiPredicate extends AbstractObservableWithUpstream { final BiPredicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java index ee5e074f58..963e5c8890 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class ObservableRetryPredicate extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableRetryWhen.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java index 0d48ef1239..054887adab 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.*; -import io.reactivex.subjects.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.subjects.*; /** * Repeatedly subscribe to a source if a handler ObservableSource signals an item. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java index a553a8dbb0..4a91ff30b8 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableSampleTimed extends AbstractObservableWithUpstream { final long period; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java index 1d5f8a5fe1..4c0fccc654 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableSampleWithObservable extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableScalarXMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java index 237661f1da..85c13e27e7 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableScalarXMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.QueueDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.QueueDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility classes to work with scalar-sourced XMap operators (where X == { flat, concat, switch }). diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java index 6b830e8d8f..026b3ac5eb 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableScan extends AbstractObservableWithUpstream { final BiFunction accumulator; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java index 369e87c790..e13c6fe189 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableScanSeed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableScanSeed extends AbstractObservableWithUpstream { final BiFunction accumulator; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java index 07da31f3f0..1e779db18e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqual.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.disposables.ArrayCompositeDisposable; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.disposables.ArrayCompositeDisposable; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; public final class ObservableSequenceEqual extends Observable { final ObservableSource first; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java index 88e059a5cb..165a8ab64a 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiPredicate; -import io.reactivex.internal.disposables.ArrayCompositeDisposable; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiPredicate; +import io.reactivex.rxjava3.internal.disposables.ArrayCompositeDisposable; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableSequenceEqualSingle extends Single implements FuseToObservable { final ObservableSource first; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSerialized.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java index eca7b42847..35ce558744 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSerialized.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java @@ -10,11 +10,10 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableSerialized extends AbstractObservableWithUpstream { public ObservableSerialized(Observable upstream) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSingleMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java index d4e1b9a375..b0bba864b9 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingleMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableSingleMaybe extends Maybe { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSingleSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java index e1232f849f..f7c8f597e1 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSingleSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java @@ -11,14 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; import java.util.NoSuchElementException; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; + public final class ObservableSingleSingle extends Single { final ObservableSource source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java index a03bca541f..9812b33663 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableSkip extends AbstractObservableWithUpstream { final long n; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java index 2ea5953c39..7d7ea2383e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.ArrayDeque; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableSkipLast extends AbstractObservableWithUpstream { final int skip; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java index 3c9eb40261..41b34b6186 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; public final class ObservableSkipLastTimed extends AbstractObservableWithUpstream { final long time; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java index f02edecf0e..9f0377b784 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableSkipUntil extends AbstractObservableWithUpstream { final ObservableSource other; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java index d452fdaf0a..04326b2647 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSkipWhile.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableSkipWhile extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java index 7e697d379a..f1fce38571 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableSubscribeOn extends AbstractObservableWithUpstream { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java index 6eec37f7a1..4b41661f1d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmpty.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class ObservableSwitchIfEmpty extends AbstractObservableWithUpstream { final ObservableSource other; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java index 724817c421..00aa8557dd 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableSwitchMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableSwitchMap extends AbstractObservableWithUpstream { final Function> mapper; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java index 2796357c80..7e675f061c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTake.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableTake extends AbstractObservableWithUpstream { final long limit; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java index 92f0510f11..45566a64e7 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLast.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.ArrayDeque; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableTakeLast extends AbstractObservableWithUpstream { final int count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java index 353f51fcf9..8f176bfebd 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastOne.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObservableTakeLastOne extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java index 7bd29092b4..9db440047b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; public final class ObservableTakeLastTimed extends AbstractObservableWithUpstream { final long count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java index 3b831b21d4..fdb376c57e 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.*; public final class ObservableTakeUntil extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java index cd984f2e07..d38aabd839 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableTakeUntilPredicate extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java index c57e6dfd12..62cb16d791 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTakeWhile.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.observable; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableTakeWhile extends AbstractObservableWithUpstream { final Predicate predicate; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java index ab1ce459f4..5708f04816 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.observers.SerializedObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableThrottleFirstTimed extends AbstractObservableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleLatest.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java index 39e0f0bfc3..9d23714549 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableThrottleLatest.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Emits the next or latest item when the given time elapses. diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java index 7d06b18f5e..f5ad5a52f5 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeInterval.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.schedulers.Timed; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.schedulers.Timed; public final class ObservableTimeInterval extends AbstractObservableWithUpstream> { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java index 2aeb9051a2..4fe72feadd 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.observable.ObservableTimeoutTimed.TimeoutSupport; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.observable.ObservableTimeoutTimed.TimeoutSupport; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableTimeout extends AbstractObservableWithUpstream { final ObservableSource firstTimeoutIndicator; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java index 9e3cb8a945..0553c9474f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableTimeoutTimed extends AbstractObservableWithUpstream { final long timeout; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableTimer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java index c635ccb9db..778388f39b 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableTimer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; public final class ObservableTimer extends Observable { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java index a4634abf93..2503428e28 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableToList.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.*; public final class ObservableToList> extends AbstractObservableWithUpstream { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableToListSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java index 9ba43848d5..31c741a56c 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableToListSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Collection; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.fuseable.FuseToObservable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.fuseable.FuseToObservable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableToListSingle> extends Single implements FuseToObservable { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java index 5f4ecad8a6..d012b7cc4d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableUnsubscribeOn extends AbstractObservableWithUpstream { final Scheduler scheduler; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java index dfc981de1e..3a4e5d81e2 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableUsing extends Observable { final Supplier resourceSupplier; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java index 0c5c50d407..08eb0327a6 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindow.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.ArrayDeque; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.subjects.UnicastSubject; public final class ObservableWindow extends AbstractObservableWithUpstream> { final long count; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java index a0fb1f9f10..f152f6f263 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundary.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.util.AtomicThrowable; -import io.reactivex.observers.DisposableObserver; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.util.AtomicThrowable; +import io.reactivex.rxjava3.observers.DisposableObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.UnicastSubject; public final class ObservableWindowBoundary extends AbstractObservableWithUpstream> { final ObservableSource other; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java index d8e745e213..35e92c3fec 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowBoundarySelector.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java @@ -11,25 +11,25 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.atomic.*; -import io.reactivex.Observable; -import io.reactivex.ObservableSource; -import io.reactivex.Observer; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.QueueDrainObserver; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.util.NotificationLite; -import io.reactivex.observers.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableSource; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.util.NotificationLite; +import io.reactivex.rxjava3.observers.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.subjects.UnicastSubject; public final class ObservableWindowBoundarySelector extends AbstractObservableWithUpstream> { final ObservableSource open; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java index 1ffc0f475e..58f94304ed 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.Observer; -import io.reactivex.Scheduler.Worker; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.QueueDrainObserver; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.util.NotificationLite; -import io.reactivex.observers.SerializedObserver; -import io.reactivex.subjects.UnicastSubject; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.QueueDrainObserver; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.util.NotificationLite; +import io.reactivex.rxjava3.observers.SerializedObserver; +import io.reactivex.rxjava3.subjects.UnicastSubject; public final class ObservableWindowTimed extends AbstractObservableWithUpstream> { final long timespan; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java index 83369a73a7..91b4b0266d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFrom.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.observers.SerializedObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.observers.SerializedObserver; public final class ObservableWithLatestFrom extends AbstractObservableWithUpstream { final BiFunction combiner; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromMany.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java index 8e88f7f92e..fc64adc42f 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromMany.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java @@ -10,21 +10,20 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.Arrays; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.annotations.NonNull; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Combines a main sequence of values with the latest from multiple other sequences via diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java index af465c43c6..faae21a6e4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableZip.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.internal.functions.ObjectHelper; import java.util.Arrays; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.queue.SpscLinkedArrayQueue; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue; public final class ObservableZip extends Observable { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/observable/ObservableZipIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java index 22b7b95196..d86b90395d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; -import io.reactivex.internal.functions.ObjectHelper; import java.util.Iterator; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ObservableZipIterable extends Observable { final Observable source; diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObserverResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/observable/ObserverResourceWrapper.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java index 80034928be..4111a36af4 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObserverResourceWrapper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.observable; +package io.reactivex.rxjava3.internal.operators.observable; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class ObserverResourceWrapper extends AtomicReference implements Observer, Disposable { diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelCollect.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java index 6f1bfb7d79..d37bcfa1b3 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelCollect.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce the sequence of values in each 'rail' to a single value. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelConcatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java index 7b75bfd81a..5b7d3ef5c4 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelConcatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.flowable.FlowableConcatMap; -import io.reactivex.internal.util.ErrorMode; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap; +import io.reactivex.rxjava3.internal.util.ErrorMode; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Concatenates the generated Publishers on each rail. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelDoOnNextTry.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java index 23fae57a80..0e93abcccb 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelDoOnNextTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.parallel.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.parallel.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a Consumer for each upstream value passing by diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelFilter.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java index 1a775d54ae..6d1fc2fb96 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFilter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Filters each 'rail' of the source ParallelFlowable with a predicate function. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelFilterTry.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java index bd0923fb70..12366c30fa 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFilterTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.parallel.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.parallel.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Filters each 'rail' of the source ParallelFlowable with a predicate function. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelFlatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java index 0c2e47a72b..1e0c9f5738 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.operators.flowable.FlowableFlatMap; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlatMap; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Flattens the generated Publishers on each rail. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelFromArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java index 9831380834..cb40caaad5 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFromArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Wraps multiple Publishers into a ParallelFlowable which runs them diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelFromPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java index 33d83ca34c..126f7cdf13 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelFromPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.exceptions.*; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.parallel.ParallelFlowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.parallel.ParallelFlowable; /** * Dispatches the values from upstream in a round robin fashion to subscribers which are diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java similarity index 96% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java index a5b8addd0b..db26589bd1 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Merges the individual 'rails' of the source ParallelFlowable, unordered, diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java index 18a627d6ad..b262bfa240 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each 'rail' of the source ParallelFlowable with a mapper function. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelMapTry.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java index 73c19733bd..8096116ea5 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelMapTry.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.parallel.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.parallel.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Maps each 'rail' of the source ParallelFlowable with a mapper function diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelPeek.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java index 3e7914c02a..4c15e207d4 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelPeek.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute a Consumer in each 'rail' for the current element passing through. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelReduce.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java index d27b7b64a6..f813149407 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelReduce.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import org.reactivestreams.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscribers.DeferredScalarSubscriber; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduce the sequence of values in each 'rail' to a single value. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelReduceFull.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelReduceFull.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java index 8757752322..3a8cfa2290 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelReduceFull.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiFunction; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiFunction; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Reduces all 'rails' into a single value which then gets reduced into a single diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java similarity index 94% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelRunOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java index 8643cc6d2b..bb6c1fd582 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelRunOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java @@ -11,23 +11,23 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.Scheduler.Worker; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.queue.SpscArrayQueue; -import io.reactivex.internal.schedulers.SchedulerMultiWorkerSupport; -import io.reactivex.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Scheduler.Worker; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.queue.SpscArrayQueue; +import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport; +import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Ensures each 'rail' from upstream runs on a Worker from a Scheduler. diff --git a/src/main/java/io/reactivex/internal/operators/parallel/ParallelSortedJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/parallel/ParallelSortedJoin.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java index a7c4947709..0e20b6f2c9 100644 --- a/src/main/java/io/reactivex/internal/operators/parallel/ParallelSortedJoin.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.parallel; +package io.reactivex.rxjava3.internal.operators.parallel; import java.util.*; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.parallel.ParallelFlowable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.parallel.ParallelFlowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Given sorted rail sequences (according to the provided comparator) as List diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/single/SingleAmb.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java index 2584506b59..7fd1dba29f 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleAmb.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleAmb extends Single { private final SingleSource[] sources; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java similarity index 97% rename from src/main/java/io/reactivex/internal/operators/single/SingleCache.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java index 1752a283b0..48220d16b1 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleCache.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; public final class SingleCache extends Single implements SingleObserver { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/single/SingleContains.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java index c8fb355f48..aaa249a6e8 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleContains.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiPredicate; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.BiPredicate; public final class SingleContains extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleCreate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java index 2b0dcfae85..1eecc7aba9 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleCreate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Cancellable; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Cancellable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleCreate extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/single/SingleDefer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java index 3c4536c911..fff2ca8d58 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDefer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleDefer extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleDelay.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java index 3ea0104a50..12da3821fc 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelay.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.TimeUnit; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.SequentialDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; public final class SingleDelay extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDelayWithCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java index 86dbd4d39f..9915ff1c66 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.ResumeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; public final class SingleDelayWithCompletable extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java index c905bba0c6..78c843db4b 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.ResumeSingleObserver; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleDelayWithObservable extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleDelayWithPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java index ee93007020..647f55916b 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.ResumeSingleObserver; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleDelayWithPublisher extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDelayWithSingle.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java index 83255b95c3..721d4dc2a5 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDelayWithSingle.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.ResumeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; public final class SingleDelayWithSingle extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/single/SingleDematerialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java index 08ec011e10..15f57b631b 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDematerialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.single; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source to a Notification, then diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleDetach.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java index ad9883a1a2..70e5ae029c 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDetach.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Breaks the references between the upstream and downstream when the Maybe terminates. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoAfterSuccess.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java index 208bb0ecba..01fa4ce590 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoAfterSuccess.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.single; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a consumer after pushing the current item to the downstream. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoAfterTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoAfterTerminate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java index eed7993231..bcb604e2ca 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoAfterTerminate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java @@ -11,16 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.single; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls an action after pushing the current item or an error to the downstream. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoFinally.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java index 7a6bc67258..bfa309be03 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoFinally.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Execute an action after an onSuccess, onError or a dispose event. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnDispose.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnDispose.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java index 29cd86d6b7..31dd0183f4 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnDispose.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleDoOnDispose extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java index c20eb7fc41..87061fdafe 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Consumer; public final class SingleDoOnError extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnEvent.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java index e057642f18..9aa9fccd8a 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnEvent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java @@ -11,15 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.BiConsumer; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BiConsumer; public final class SingleDoOnEvent extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnSubscribe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java index 4103ad6c79..d7c9230fb7 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnSubscribe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.single; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a callback when the upstream calls onSubscribe with a disposable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java similarity index 88% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnSuccess.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java index f915c984cd..2efec6acdd 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnSuccess.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Consumer; public final class SingleDoOnSuccess extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/single/SingleDoOnTerminate.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java index 7497aff902..1bb0ca2dec 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleDoOnTerminate.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java @@ -11,15 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Action; public final class SingleDoOnTerminate extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleEquals.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleEquals.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java index 07d3f36602..8a9f62473f 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleEquals.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleEquals extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java similarity index 80% rename from src/main/java/io/reactivex/internal/operators/single/SingleError.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java index b832dc8fdc..0af754a6b9 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleError.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleError extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java index 2913ff79d7..3128c93e5a 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java @@ -11,16 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.single; + import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; + public final class SingleFlatMap extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMapCompletable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java index 31b9ac2c99..03edadb83b 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapCompletable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Maps the success value of the source SingleSource into a Completable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java index f6f4c79cf5..cc7f2740b9 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java @@ -11,22 +11,22 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.*; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.*; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Maps a success value into an Iterable and streams it back as a Flowable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java index b3f822cc91..d742a06e1c 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.Iterator; -import io.reactivex.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.BasicIntQueueDisposable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable; /** * Maps a success value into an Iterable and streams it back as an Observable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMapMaybe.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java index dfe6b60143..20e60ab476 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapMaybe.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java @@ -11,20 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.Maybe; -import io.reactivex.MaybeObserver; -import io.reactivex.MaybeSource; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; +package io.reactivex.rxjava3.internal.operators.single; + import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; + public final class SingleFlatMapMaybe extends Maybe { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/single/SingleFlatMapPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java index be090bd20b..0fb91438c8 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMapPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java @@ -11,25 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - -import io.reactivex.Flowable; -import io.reactivex.FlowableSubscriber; -import io.reactivex.Scheduler; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +package io.reactivex.rxjava3.internal.operators.single; + +import java.util.concurrent.atomic.*; + +import org.reactivestreams.*; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; /** * A Flowable that emits items based on applying a specified function to the item emitted by the diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java similarity index 83% rename from src/main/java/io/reactivex/internal/operators/single/SingleFromCallable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java index 2b5ff36a98..562032f01e 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFromCallable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java @@ -11,16 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.Callable; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.disposables.Disposables; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleFromCallable extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleFromPublisher.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java index 5709f3c6d4..e18394eb1a 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFromPublisher.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.NoSuchElementException; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleFromPublisher extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java similarity index 82% rename from src/main/java/io/reactivex/internal/operators/single/SingleFromSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java index 99766aed42..04d6ca72cf 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFromSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; - -import io.reactivex.*; -import io.reactivex.disposables.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Supplier; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.operators.single; + +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Supplier; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Calls a supplier and emits its value or exception to the incoming SingleObserver. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleFromUnsafeSource.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java index c8ce55d339..328ab873b6 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleFromUnsafeSource.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; +import io.reactivex.rxjava3.core.*; public final class SingleFromUnsafeSource extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/single/SingleHide.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java index 7ec7390e20..34f5dc4aed 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleHide.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class SingleHide extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java similarity index 95% rename from src/main/java/io/reactivex/internal/operators/single/SingleInternalHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java index e0be7d2958..8c322ada64 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleInternalHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.*; import java.util.concurrent.Callable; import org.reactivestreams.Publisher; -import io.reactivex.*; -import io.reactivex.Observable; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.functions.*; /** * Helper utility class to support Single with inner classes. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/single/SingleJust.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java index 5e3dfdcd61..8495f931db 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleJust.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposables; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposables; public final class SingleJust extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java similarity index 83% rename from src/main/java/io/reactivex/internal/operators/single/SingleLift.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java index 3d55453b8e..af5f969157 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleLift.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleLift extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleMap.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java index 25ddcdf3e4..d6ee948d5a 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleMap.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; public final class SingleMap extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleMaterialize.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java index bfc149b2ff..fd0afc2f98 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleMaterialize.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.internal.operators.mixed.MaterializeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.operators.mixed.MaterializeSingleObserver; /** * Turn the signal types of a Single source into a single Notification of diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java similarity index 85% rename from src/main/java/io/reactivex/internal/operators/single/SingleNever.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java index a3c46ebc99..ea76fac50d 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleNever.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; public final class SingleNever extends Single { public static final Single INSTANCE = new SingleNever(); diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleObserveOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java index 7c8a6c1977..035f458e11 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleObserveOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; public final class SingleObserveOn extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java similarity index 91% rename from src/main/java/io/reactivex/internal/operators/single/SingleOnErrorReturn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java index 0ae695a3e8..1a606d2750 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleOnErrorReturn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; public final class SingleOnErrorReturn extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleResumeNext.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java index 325365f8f4..71ccfdc035 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleResumeNext.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.observers.ResumeSingleObserver; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver; public final class SingleResumeNext extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleSubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java index 9b29e6253f..79187148cd 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleSubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; public final class SingleSubscribeOn extends Single { final SingleSource source; diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/single/SingleTakeUntil.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java index 8db5e40a03..e69ac1b118 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleTakeUntil.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.CancellationException; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Signals the events of the source Single or signals a CancellationException if the diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/single/SingleTimeout.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java index ea4212f0ec..1cb417c8db 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleTimeout.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleTimeout extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java similarity index 90% rename from src/main/java/io/reactivex/internal/operators/single/SingleTimer.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java index 68b4c9c3b7..5188f3a2c9 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleTimer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Signals a {@code 0L} after the specified delay. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java similarity index 87% rename from src/main/java/io/reactivex/internal/operators/single/SingleToFlowable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java index de2b8a9ed8..890f6b0569 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleToFlowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.DeferredScalarSubscription; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription; /** * Wraps a Single and exposes it as a Flowable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java similarity index 89% rename from src/main/java/io/reactivex/internal/operators/single/SingleToObservable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java index 2c4126a837..18ecef340f 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleToObservable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java @@ -10,12 +10,12 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.observers.DeferredScalarDisposable; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable; /** * Wraps a Single and exposes it as an Observable. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleUnsubscribeOn.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java index dc7962ba8e..3f5b20b20c 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleUnsubscribeOn.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * Makes sure a dispose() call from downstream happens on the specified scheduler. diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java similarity index 93% rename from src/main/java/io/reactivex/internal/operators/single/SingleUsing.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java index 55fa142a26..a0cb1d84d9 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleUsing.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleUsing extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java similarity index 92% rename from src/main/java/io/reactivex/internal/operators/single/SingleZipArray.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java index 211e4b93b5..9633e94bc7 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleZipArray.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java @@ -11,17 +11,17 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.concurrent.atomic.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class SingleZipArray extends Single { diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java similarity index 86% rename from src/main/java/io/reactivex/internal/operators/single/SingleZipIterable.java rename to src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java index 50f66100e9..215f19a58e 100644 --- a/src/main/java/io/reactivex/internal/operators/single/SingleZipIterable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.operators.single; +package io.reactivex.rxjava3.internal.operators.single; import java.util.*; -import io.reactivex.*; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.operators.single.SingleZipArray.ZipCoordinator; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.operators.single.SingleZipArray.ZipCoordinator; public final class SingleZipIterable extends Single { diff --git a/src/main/java/io/reactivex/internal/queue/MpscLinkedQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java similarity index 97% rename from src/main/java/io/reactivex/internal/queue/MpscLinkedQueue.java rename to src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java index c33147de06..8458e8d876 100644 --- a/src/main/java/io/reactivex/internal/queue/MpscLinkedQueue.java +++ b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java @@ -16,12 +16,12 @@ * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic */ -package io.reactivex.internal.queue; +package io.reactivex.rxjava3.internal.queue; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; /** * A multi-producer single consumer unbounded queue. diff --git a/src/main/java/io/reactivex/internal/queue/SpscArrayQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java similarity index 95% rename from src/main/java/io/reactivex/internal/queue/SpscArrayQueue.java rename to src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java index 53ac212600..c86a109f81 100644 --- a/src/main/java/io/reactivex/internal/queue/SpscArrayQueue.java +++ b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java @@ -16,13 +16,13 @@ * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic */ -package io.reactivex.internal.queue; +package io.reactivex.rxjava3.internal.queue; import java.util.concurrent.atomic.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.util.Pow2; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.util.Pow2; /** * A Single-Producer-Single-Consumer queue backed by a pre-allocated buffer. diff --git a/src/main/java/io/reactivex/internal/queue/SpscLinkedArrayQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java similarity index 98% rename from src/main/java/io/reactivex/internal/queue/SpscLinkedArrayQueue.java rename to src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java index e5e71e29f4..4a2a182dfc 100644 --- a/src/main/java/io/reactivex/internal/queue/SpscLinkedArrayQueue.java +++ b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java @@ -16,13 +16,13 @@ * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic */ -package io.reactivex.internal.queue; +package io.reactivex.rxjava3.internal.queue; import java.util.concurrent.atomic.*; -import io.reactivex.annotations.Nullable; -import io.reactivex.internal.fuseable.SimplePlainQueue; -import io.reactivex.internal.util.Pow2; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.util.Pow2; /** * A single-producer single-consumer array-backed queue which can allocate new arrays in case the consumer is slower diff --git a/src/main/java/io/reactivex/internal/schedulers/AbstractDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java similarity index 91% rename from src/main/java/io/reactivex/internal/schedulers/AbstractDirectTask.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java index 2bf3c454f4..2788bdfec6 100644 --- a/src/main/java/io/reactivex/internal/schedulers/AbstractDirectTask.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.functions.Functions; -import io.reactivex.schedulers.SchedulerRunnableIntrospection; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.schedulers.SchedulerRunnableIntrospection; /** * Base functionality for direct tasks that manage a runnable and cancellation/completion. diff --git a/src/main/java/io/reactivex/internal/schedulers/ComputationScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java similarity index 96% rename from src/main/java/io/reactivex/internal/schedulers/ComputationScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java index 6f10ab2867..56fc837cff 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ComputationScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Holds a fixed pool of worker threads and assigns them diff --git a/src/main/java/io/reactivex/internal/schedulers/DisposeOnCancel.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java similarity index 93% rename from src/main/java/io/reactivex/internal/schedulers/DisposeOnCancel.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java index c79eaeb149..231cb5b3f2 100644 --- a/src/main/java/io/reactivex/internal/schedulers/DisposeOnCancel.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * Implements the Future interface and calls dispose() on cancel() but diff --git a/src/main/java/io/reactivex/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java similarity index 96% rename from src/main/java/io/reactivex/internal/schedulers/ExecutorScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java index 75322a8de8..16fdf98032 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ExecutorScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.queue.MpscLinkedQueue; -import io.reactivex.internal.schedulers.ExecutorScheduler.ExecutorWorker.*; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.*; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue; +import io.reactivex.rxjava3.internal.schedulers.ExecutorScheduler.ExecutorWorker.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.*; /** * Wraps an Executor and provides the Scheduler API over it. diff --git a/src/main/java/io/reactivex/internal/schedulers/ImmediateThinScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java similarity index 94% rename from src/main/java/io/reactivex/internal/schedulers/ImmediateThinScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java index 990a8cdd14..b1e47267b9 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ImmediateThinScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.TimeUnit; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; /** * A Scheduler partially implementing the API by allowing only non-delayed, non-periodic diff --git a/src/main/java/io/reactivex/internal/schedulers/InstantPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java similarity index 93% rename from src/main/java/io/reactivex/internal/schedulers/InstantPeriodicTask.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java index ec9b2a0d2f..678c82e794 100644 --- a/src/main/java/io/reactivex/internal/schedulers/InstantPeriodicTask.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.functions.Functions; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Wrapper for a regular task that gets immediately rescheduled when the task completed. diff --git a/src/main/java/io/reactivex/internal/schedulers/IoScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java similarity index 97% rename from src/main/java/io/reactivex/internal/schedulers/IoScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java index d806321bf3..71fdfd3cd6 100644 --- a/src/main/java/io/reactivex/internal/schedulers/IoScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; - -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.EmptyDisposable; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; + /** * Scheduler that creates and caches a set of thread pools and reuses them if possible. */ diff --git a/src/main/java/io/reactivex/internal/schedulers/NewThreadScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java similarity index 92% rename from src/main/java/io/reactivex/internal/schedulers/NewThreadScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java index 2513cb300d..4322f0fe71 100644 --- a/src/main/java/io/reactivex/internal/schedulers/NewThreadScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; - -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.ThreadFactory; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; + /** * Schedules work on a new thread. */ diff --git a/src/main/java/io/reactivex/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java similarity index 95% rename from src/main/java/io/reactivex/internal/schedulers/NewThreadWorker.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java index 9ef225aceb..46fe9267a6 100644 --- a/src/main/java/io/reactivex/internal/schedulers/NewThreadWorker.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java @@ -11,16 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.annotations.Nullable; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Base class that manages a single-threaded ScheduledExecutorService as a diff --git a/src/main/java/io/reactivex/internal/schedulers/NonBlockingThread.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java similarity index 93% rename from src/main/java/io/reactivex/internal/schedulers/NonBlockingThread.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java index cc54aad8a3..f800f1ac4e 100644 --- a/src/main/java/io/reactivex/internal/schedulers/NonBlockingThread.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; /** * Marker interface to indicate blocking is not recommended while running diff --git a/src/main/java/io/reactivex/internal/schedulers/RxThreadFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java similarity index 98% rename from src/main/java/io/reactivex/internal/schedulers/RxThreadFactory.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java index 45b924ea80..7d0646056d 100644 --- a/src/main/java/io/reactivex/internal/schedulers/RxThreadFactory.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java similarity index 92% rename from src/main/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTask.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java index 201847ba75..695760f2ca 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTask.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Callable to be submitted to an ExecutorService that runs a Runnable diff --git a/src/main/java/io/reactivex/internal/schedulers/ScheduledDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java similarity index 96% rename from src/main/java/io/reactivex/internal/schedulers/ScheduledDirectTask.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java index 44d4ce52e0..89bd9d3d01 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ScheduledDirectTask.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.Callable; diff --git a/src/main/java/io/reactivex/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java similarity index 95% rename from src/main/java/io/reactivex/internal/schedulers/ScheduledRunnable.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java index 61218fbe40..d5935e2f89 100644 --- a/src/main/java/io/reactivex/internal/schedulers/ScheduledRunnable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReferenceArray; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableContainer; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableContainer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ScheduledRunnable extends AtomicReferenceArray implements Runnable, Callable, Disposable { diff --git a/src/main/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupport.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java similarity index 80% rename from src/main/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupport.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java index 9eec7eef0c..d42fa32cfb 100644 --- a/src/main/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupport.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; -import io.reactivex.Scheduler; -import io.reactivex.annotations.*; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; /** * Allows retrieving multiple workers from the implementing - * {@link io.reactivex.Scheduler} in a way that when asking for + * {@link io.reactivex.rxjava3.core.Scheduler} in a way that when asking for * at most the parallelism level of the Scheduler, those - * {@link io.reactivex.Scheduler.Worker} instances will be running + * {@link io.reactivex.rxjava3.core.Scheduler.Worker} instances will be running * with different backing threads. *

    History: 2.1.8 - experimental * @since 2.2 @@ -28,7 +28,7 @@ public interface SchedulerMultiWorkerSupport { /** - * Creates the given number of {@link io.reactivex.Scheduler.Worker} instances + * Creates the given number of {@link io.reactivex.rxjava3.core.Scheduler.Worker} instances * that are possibly backed by distinct threads * and calls the specified {@code Consumer} with them. * @param number the number of workers to create, positive diff --git a/src/main/java/io/reactivex/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java similarity index 99% rename from src/main/java/io/reactivex/internal/schedulers/SchedulerPoolFactory.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java index b0b1339d29..4e6d7844c7 100644 --- a/src/main/java/io/reactivex/internal/schedulers/SchedulerPoolFactory.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.*; import java.util.concurrent.*; diff --git a/src/main/java/io/reactivex/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java similarity index 92% rename from src/main/java/io/reactivex/internal/schedulers/SchedulerWhen.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java index 4d56335527..5a15e61223 100644 --- a/src/main/java/io/reactivex/internal/schedulers/SchedulerWhen.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java @@ -13,24 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.Flowable; -import io.reactivex.Observable; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; -import io.reactivex.disposables.Disposables; -import io.reactivex.functions.Function; -import io.reactivex.internal.util.ExceptionHelper; -import io.reactivex.processors.FlowableProcessor; -import io.reactivex.processors.UnicastProcessor; +import java.util.concurrent.atomic.*; + +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.util.ExceptionHelper; +import io.reactivex.rxjava3.processors.*; /** * Allows the use of operators for controlling the timing around when actions @@ -51,7 +44,7 @@ * Finally the actions scheduled on the parent {@link Scheduler} when the inner * most {@link Completable}s are subscribed to. *

    - * When the {@link io.reactivex.Scheduler.Worker Worker} is unsubscribed the {@link Completable} emits an + * When the {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker} is unsubscribed the {@link Completable} emits an * onComplete and triggers any behavior in the flattening operator. The * {@link Observable} and all {@link Completable}s give to the flattening * function never onError. @@ -69,11 +62,11 @@ *

    * This is a slightly different way to limit the concurrency but it has some * interesting benefits and drawbacks to the method above. It works by limited - * the number of concurrent {@link io.reactivex.Scheduler.Worker Worker}s rather than individual actions. - * Generally each {@link Observable} uses its own {@link io.reactivex.Scheduler.Worker Worker}. This means + * the number of concurrent {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}s rather than individual actions. + * Generally each {@link Observable} uses its own {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}. This means * that this will essentially limit the number of concurrent subscribes. The * danger comes from using operators like - * {@link Flowable#zip(org.reactivestreams.Publisher, org.reactivestreams.Publisher, io.reactivex.functions.BiFunction)} where + * {@link Flowable#zip(org.reactivestreams.Publisher, org.reactivestreams.Publisher, io.reactivex.rxjava3.functions.BiFunction)} where * subscribing to the first {@link Observable} could deadlock the subscription * to the second. * diff --git a/src/main/java/io/reactivex/internal/schedulers/SingleScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java similarity index 95% rename from src/main/java/io/reactivex/internal/schedulers/SingleScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java index 40a7ce0b85..35f60c8eb9 100644 --- a/src/main/java/io/reactivex/internal/schedulers/SingleScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java @@ -10,17 +10,17 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.schedulers; - -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.plugins.RxJavaPlugins; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; + /** * A scheduler with a shared, single threaded underlying ScheduledExecutorService. * @since 2.0 diff --git a/src/main/java/io/reactivex/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java similarity index 94% rename from src/main/java/io/reactivex/internal/schedulers/TrampolineScheduler.java rename to src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java index 49a053f9db..cc61d797e9 100644 --- a/src/main/java/io/reactivex/internal/schedulers/TrampolineScheduler.java +++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.reactivex.internal.schedulers; +package io.reactivex.rxjava3.internal.schedulers; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.Scheduler; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.*; -import io.reactivex.internal.disposables.EmptyDisposable; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.disposables.*; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Schedules work on the current thread but does not execute immediately. Work is put in a queue and executed diff --git a/src/main/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java similarity index 95% rename from src/main/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java index f665d48a49..ae1e72c3f8 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import org.reactivestreams.Subscription; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Base class for a fuseable intermediate subscriber. diff --git a/src/main/java/io/reactivex/internal/subscribers/BasicFuseableSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java similarity index 93% rename from src/main/java/io/reactivex/internal/subscribers/BasicFuseableSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java index 945d311b29..b0944cacec 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BasicFuseableSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.internal.fuseable.QueueSubscription; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Base class for a fuseable intermediate subscriber. diff --git a/src/main/java/io/reactivex/internal/subscribers/BlockingBaseSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java similarity index 91% rename from src/main/java/io/reactivex/internal/subscribers/BlockingBaseSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java index 72a1374420..cf93064c6a 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BlockingBaseSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.CountDownLatch; import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; public abstract class BlockingBaseSubscriber extends CountDownLatch implements FlowableSubscriber { diff --git a/src/main/java/io/reactivex/internal/subscribers/BlockingFirstSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java similarity index 91% rename from src/main/java/io/reactivex/internal/subscribers/BlockingFirstSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java index 57fd44623f..228023b3d9 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BlockingFirstSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Blocks until the upstream signals its first value or completes. diff --git a/src/main/java/io/reactivex/internal/subscribers/BlockingLastSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java similarity index 95% rename from src/main/java/io/reactivex/internal/subscribers/BlockingLastSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java index e851b6bd4a..1889193770 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BlockingLastSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; /** * Blocks until the upstream signals its last value or completes. diff --git a/src/main/java/io/reactivex/internal/subscribers/BlockingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java similarity index 89% rename from src/main/java/io/reactivex/internal/subscribers/BlockingSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java index 5f84aefd87..9ddba51e3c 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BlockingSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.Queue; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.NotificationLite; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.NotificationLite; public final class BlockingSubscriber extends AtomicReference implements FlowableSubscriber, Subscription { diff --git a/src/main/java/io/reactivex/internal/subscribers/BoundedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java similarity index 87% rename from src/main/java/io/reactivex/internal/subscribers/BoundedSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java index 5adbfeb207..7ea697a3ab 100644 --- a/src/main/java/io/reactivex/internal/subscribers/BoundedSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java @@ -11,22 +11,21 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; - -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.functions.Functions; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.observers.LambdaConsumerIntrospection; -import io.reactivex.plugins.RxJavaPlugins; -import org.reactivestreams.Subscription; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicReference; +import org.reactivestreams.Subscription; + +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; + public final class BoundedSubscriber extends AtomicReference implements FlowableSubscriber, Subscription, Disposable, LambdaConsumerIntrospection { diff --git a/src/main/java/io/reactivex/internal/subscribers/DeferredScalarSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java similarity index 93% rename from src/main/java/io/reactivex/internal/subscribers/DeferredScalarSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java index 701b4a44bc..5fca99286a 100644 --- a/src/main/java/io/reactivex/internal/subscribers/DeferredScalarSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.*; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.*; /** * A subscriber, extending a DeferredScalarSubscription, diff --git a/src/main/java/io/reactivex/internal/subscribers/ForEachWhileSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java similarity index 88% rename from src/main/java/io/reactivex/internal/subscribers/ForEachWhileSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java index 5e15bea285..34d00eef9d 100644 --- a/src/main/java/io/reactivex/internal/subscribers/ForEachWhileSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class ForEachWhileSubscriber extends AtomicReference diff --git a/src/main/java/io/reactivex/internal/subscribers/FutureSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java similarity index 92% rename from src/main/java/io/reactivex/internal/subscribers/FutureSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java index 4b2c329c97..1e09f5b414 100644 --- a/src/main/java/io/reactivex/internal/subscribers/FutureSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java @@ -11,7 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; + +import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage; import java.util.NoSuchElementException; import java.util.concurrent.*; @@ -19,12 +21,10 @@ import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BlockingHelper; -import io.reactivex.plugins.RxJavaPlugins; - -import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BlockingHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * A Subscriber + Future that expects exactly one upstream value and provides it diff --git a/src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java similarity index 92% rename from src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java index 70ea26740e..c53138e3d7 100644 --- a/src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.QueueDrainHelper; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.QueueDrainHelper; /** * Subscriber that can fuse with the upstream and calls a support interface diff --git a/src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberSupport.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java similarity index 95% rename from src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberSupport.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java index 6a87c9616b..e7deb5c411 100644 --- a/src/main/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberSupport.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; /** * Interface to allow the InnerQueuedSubscriber to call back a parent diff --git a/src/main/java/io/reactivex/internal/subscribers/LambdaSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java similarity index 87% rename from src/main/java/io/reactivex/internal/subscribers/LambdaSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java index 5568cf5156..daa76fdfbf 100644 --- a/src/main/java/io/reactivex/internal/subscribers/LambdaSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java @@ -11,20 +11,20 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.internal.functions.Functions; -import io.reactivex.observers.LambdaConsumerIntrospection; import org.reactivestreams.Subscription; -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.*; +import io.reactivex.rxjava3.internal.functions.Functions; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public final class LambdaSubscriber extends AtomicReference implements FlowableSubscriber, Subscription, Disposable, LambdaConsumerIntrospection { diff --git a/src/main/java/io/reactivex/internal/subscribers/QueueDrainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java similarity index 93% rename from src/main/java/io/reactivex/internal/subscribers/QueueDrainSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java index d07f748999..c66505a071 100644 --- a/src/main/java/io/reactivex/internal/subscribers/QueueDrainSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscriber; -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.MissingBackpressureException; +import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; /** * Abstract base class for subscribers that hold another subscriber, a queue diff --git a/src/main/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java similarity index 94% rename from src/main/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java index 4ea2ac2368..ab9f9ba799 100644 --- a/src/main/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Relays signals from upstream according to downstream requests and allows diff --git a/src/main/java/io/reactivex/internal/subscribers/StrictSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java similarity index 93% rename from src/main/java/io/reactivex/internal/subscribers/StrictSubscriber.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java index 0fb9d5666c..32668ed4d9 100644 --- a/src/main/java/io/reactivex/internal/subscribers/StrictSubscriber.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.*; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.*; /** * Ensures that the event flow between the upstream and downstream follow diff --git a/src/main/java/io/reactivex/internal/subscribers/SubscriberResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java similarity index 88% rename from src/main/java/io/reactivex/internal/subscribers/SubscriberResourceWrapper.java rename to src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java index 807430bb7b..55d052c705 100644 --- a/src/main/java/io/reactivex/internal/subscribers/SubscriberResourceWrapper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscribers; +package io.reactivex.rxjava3.internal.subscribers; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.*; -import io.reactivex.FlowableSubscriber; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; public final class SubscriberResourceWrapper extends AtomicReference implements FlowableSubscriber, Disposable, Subscription { diff --git a/src/main/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java similarity index 97% rename from src/main/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java index b035e23d6f..628891a7e6 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.AtomicReferenceArray; import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; /** * A composite disposable with a fixed number of slots. diff --git a/src/main/java/io/reactivex/internal/subscriptions/AsyncSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java similarity index 94% rename from src/main/java/io/reactivex/internal/subscriptions/AsyncSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java index 4a075ced45..370c45ffbe 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/AsyncSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; /** * A subscription implementation that arbitrates exactly one other Subscription and can diff --git a/src/main/java/io/reactivex/internal/subscriptions/BasicIntQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java similarity index 91% rename from src/main/java/io/reactivex/internal/subscriptions/BasicIntQueueSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java index a3d2259fd9..862fb51b4b 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/BasicIntQueueSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class extending AtomicInteger (wip or request accounting) and QueueSubscription (fusion). diff --git a/src/main/java/io/reactivex/internal/subscriptions/BasicQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java similarity index 91% rename from src/main/java/io/reactivex/internal/subscriptions/BasicQueueSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java index ebb9935ed8..54d33f26cb 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/BasicQueueSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.AtomicLong; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * Base class extending AtomicLong (wip or request accounting) and QueueSubscription (fusion). diff --git a/src/main/java/io/reactivex/internal/subscriptions/BooleanSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java similarity index 96% rename from src/main/java/io/reactivex/internal/subscriptions/BooleanSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java index 7190389661..117b09b60c 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/BooleanSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/io/reactivex/internal/subscriptions/DeferredScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java similarity index 98% rename from src/main/java/io/reactivex/internal/subscriptions/DeferredScalarSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java index 131d1d2342..b50b4e13f9 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/DeferredScalarSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java @@ -11,11 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; +import io.reactivex.rxjava3.annotations.Nullable; + /** * A subscription that signals a single value eventually. *

    diff --git a/src/main/java/io/reactivex/internal/subscriptions/EmptySubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java similarity index 94% rename from src/main/java/io/reactivex/internal/subscriptions/EmptySubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java index d4d78f3279..2da5f529a1 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/EmptySubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * An empty subscription that does nothing other than validates the request amount. diff --git a/src/main/java/io/reactivex/internal/subscriptions/ScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java similarity index 94% rename from src/main/java/io/reactivex/internal/subscriptions/ScalarSubscription.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java index d16484c31a..e854c11f92 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/ScalarSubscription.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.annotations.Nullable; import org.reactivestreams.Subscriber; -import io.reactivex.internal.fuseable.QueueSubscription; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.internal.fuseable.QueueSubscription; /** * A Subscription that holds a constant value and emits it only when requested. diff --git a/src/main/java/io/reactivex/internal/subscriptions/SubscriptionArbiter.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java similarity index 97% rename from src/main/java/io/reactivex/internal/subscriptions/SubscriptionArbiter.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java index 2796573392..c3fb7955fa 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/SubscriptionArbiter.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; /** * Copyright (c) 2016-present, RxJava Contributors. * @@ -29,8 +29,8 @@ import org.reactivestreams.Subscription; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; /** * Arbitrates requests and cancellation between Subscriptions. diff --git a/src/main/java/io/reactivex/internal/subscriptions/SubscriptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java similarity index 96% rename from src/main/java/io/reactivex/internal/subscriptions/SubscriptionHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java index ca19d0d4a3..7080b3472c 100644 --- a/src/main/java/io/reactivex/internal/subscriptions/SubscriptionHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.subscriptions; +package io.reactivex.rxjava3.internal.subscriptions; import java.util.concurrent.atomic.*; import org.reactivestreams.Subscription; -import io.reactivex.exceptions.ProtocolViolationException; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.ProtocolViolationException; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods to validate Subscriptions in the various onSubscribe calls. diff --git a/src/main/java/io/reactivex/internal/util/AppendOnlyLinkedArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/AppendOnlyLinkedArrayList.java rename to src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java index 0776c6e237..a2a78e7b7e 100644 --- a/src/main/java/io/reactivex/internal/util/AppendOnlyLinkedArrayList.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java @@ -11,12 +11,12 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import org.reactivestreams.Subscriber; -import io.reactivex.Observer; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.functions.*; /** * A linked-array-list implementation that only supports appending and consumption. diff --git a/src/main/java/io/reactivex/internal/util/ArrayListSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java similarity index 93% rename from src/main/java/io/reactivex/internal/util/ArrayListSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java index 918cab0327..1f82daf237 100644 --- a/src/main/java/io/reactivex/internal/util/ArrayListSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.*; public enum ArrayListSupplier implements Supplier>, Function> { INSTANCE; diff --git a/src/main/java/io/reactivex/internal/util/AtomicThrowable.java b/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/AtomicThrowable.java rename to src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java index 14aed2b98b..5a4ca39df3 100644 --- a/src/main/java/io/reactivex/internal/util/AtomicThrowable.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java @@ -11,14 +11,14 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscriber; -import io.reactivex.*; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Atomic container for Throwables including combining and having a diff --git a/src/main/java/io/reactivex/internal/util/BackpressureHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java similarity index 98% rename from src/main/java/io/reactivex/internal/util/BackpressureHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java index f2f7822613..9237c11a18 100644 --- a/src/main/java/io/reactivex/internal/util/BackpressureHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java @@ -10,11 +10,11 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.concurrent.atomic.AtomicLong; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility class to help with backpressure-related operations such as request aggregation. diff --git a/src/main/java/io/reactivex/internal/util/BlockingHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java similarity index 92% rename from src/main/java/io/reactivex/internal/util/BlockingHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java index 7be3695206..57d9f863b3 100644 --- a/src/main/java/io/reactivex/internal/util/BlockingHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.concurrent.CountDownLatch; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.schedulers.NonBlockingThread; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.schedulers.NonBlockingThread; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods for helping common blocking operations. diff --git a/src/main/java/io/reactivex/internal/util/BlockingIgnoringReceiver.java b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java similarity index 92% rename from src/main/java/io/reactivex/internal/util/BlockingIgnoringReceiver.java rename to src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java index 2be0090865..f0d90e4708 100644 --- a/src/main/java/io/reactivex/internal/util/BlockingIgnoringReceiver.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.concurrent.CountDownLatch; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.*; /** * Stores an incoming Throwable (if any) and counts itself down. diff --git a/src/main/java/io/reactivex/internal/util/ConnectConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java similarity index 85% rename from src/main/java/io/reactivex/internal/util/ConnectConsumer.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java index e4a010654b..4d4f160a8a 100644 --- a/src/main/java/io/reactivex/internal/util/ConnectConsumer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java @@ -11,10 +11,10 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; /** * Store the Disposable received from the connection. diff --git a/src/main/java/io/reactivex/internal/util/EmptyComponent.java b/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java similarity index 91% rename from src/main/java/io/reactivex/internal/util/EmptyComponent.java rename to src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java index 348813cb9e..1ffc9c51d4 100644 --- a/src/main/java/io/reactivex/internal/util/EmptyComponent.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import org.reactivestreams.*; -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Singleton implementing many interfaces as empty. diff --git a/src/main/java/io/reactivex/internal/util/EndConsumerHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java similarity index 92% rename from src/main/java/io/reactivex/internal/util/EndConsumerHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java index 48b8032a09..1e051a636c 100644 --- a/src/main/java/io/reactivex/internal/util/EndConsumerHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java @@ -11,18 +11,18 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; -import java.util.concurrent.atomic.*; +import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Subscription; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.ProtocolViolationException; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.functions.ObjectHelper; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.ProtocolViolationException; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility class to help report multiple subscriptions with the same diff --git a/src/main/java/io/reactivex/internal/util/ErrorMode.java b/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java similarity index 95% rename from src/main/java/io/reactivex/internal/util/ErrorMode.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java index 33b9ededf5..e3ff3d5fdb 100644 --- a/src/main/java/io/reactivex/internal/util/ErrorMode.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; /** * Indicates when an error from the main source should be reported. diff --git a/src/main/java/io/reactivex/internal/util/ExceptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/ExceptionHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java index ecd970c730..03546c47fe 100644 --- a/src/main/java/io/reactivex/internal/util/ExceptionHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java @@ -11,13 +11,13 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.exceptions.CompositeException; +import io.reactivex.rxjava3.exceptions.CompositeException; /** * Terminal atomics for Throwable containers. diff --git a/src/main/java/io/reactivex/internal/util/HalfSerializer.java b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/HalfSerializer.java rename to src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java index 067ee7fd2a..b07c317ab4 100644 --- a/src/main/java/io/reactivex/internal/util/HalfSerializer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java @@ -10,14 +10,14 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.concurrent.atomic.AtomicInteger; import org.reactivestreams.Subscriber; -import io.reactivex.Observer; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; /** * Utility methods to perform half-serialization: a form of serialization diff --git a/src/main/java/io/reactivex/internal/util/HashMapSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java similarity index 91% rename from src/main/java/io/reactivex/internal/util/HashMapSupplier.java rename to src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java index 18b92c7a35..22d9900d19 100644 --- a/src/main/java/io/reactivex/internal/util/HashMapSupplier.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; -import io.reactivex.functions.Supplier; +import io.reactivex.rxjava3.functions.Supplier; public enum HashMapSupplier implements Supplier> { INSTANCE; diff --git a/src/main/java/io/reactivex/internal/util/LinkedArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java similarity index 98% rename from src/main/java/io/reactivex/internal/util/LinkedArrayList.java rename to src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java index 6dbf3fb6e4..f4b1d4aae2 100644 --- a/src/main/java/io/reactivex/internal/util/LinkedArrayList.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java @@ -10,7 +10,7 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; diff --git a/src/main/java/io/reactivex/internal/util/ListAddBiConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java similarity index 91% rename from src/main/java/io/reactivex/internal/util/ListAddBiConsumer.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java index 787c5efbe2..9f484f1700 100644 --- a/src/main/java/io/reactivex/internal/util/ListAddBiConsumer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.List; -import io.reactivex.functions.*; +import io.reactivex.rxjava3.functions.BiFunction; @SuppressWarnings("rawtypes") public enum ListAddBiConsumer implements BiFunction { diff --git a/src/main/java/io/reactivex/internal/util/MergerBiFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java similarity index 95% rename from src/main/java/io/reactivex/internal/util/MergerBiFunction.java rename to src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java index ba13a4b7a6..9efe097a7c 100644 --- a/src/main/java/io/reactivex/internal/util/MergerBiFunction.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; -import io.reactivex.functions.BiFunction; +import io.reactivex.rxjava3.functions.BiFunction; /** * A BiFunction that merges two Lists into a new list. diff --git a/src/main/java/io/reactivex/internal/util/NotificationLite.java b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/NotificationLite.java rename to src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java index 2359141e5e..dbc54c788a 100644 --- a/src/main/java/io/reactivex/internal/util/NotificationLite.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java @@ -10,15 +10,15 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.io.Serializable; import org.reactivestreams.*; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.functions.ObjectHelper; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.functions.ObjectHelper; /** * Lightweight notification handling utility class. diff --git a/src/main/java/io/reactivex/internal/util/ObservableQueueDrain.java b/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java similarity index 92% rename from src/main/java/io/reactivex/internal/util/ObservableQueueDrain.java rename to src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java index 5b595e67c7..c0187e9cc2 100644 --- a/src/main/java/io/reactivex/internal/util/ObservableQueueDrain.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java @@ -11,9 +11,9 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; -import io.reactivex.Observer; +import io.reactivex.rxjava3.core.Observer; public interface ObservableQueueDrain { diff --git a/src/main/java/io/reactivex/internal/util/OpenHashSet.java b/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java similarity index 99% rename from src/main/java/io/reactivex/internal/util/OpenHashSet.java rename to src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java index f971002ad0..c5bf3bb676 100644 --- a/src/main/java/io/reactivex/internal/util/OpenHashSet.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java @@ -16,7 +16,7 @@ * https://github.com/vigna/fastutil/blob/master/drv/OpenHashSet.drv */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; /** * A simple open hash set with add, remove and clear capabilities only. diff --git a/src/main/java/io/reactivex/internal/util/Pow2.java b/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/Pow2.java rename to src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java index db4317132c..dd6df01d9e 100644 --- a/src/main/java/io/reactivex/internal/util/Pow2.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java @@ -15,7 +15,7 @@ * Original License: https://github.com/JCTools/JCTools/blob/master/LICENSE * Original location: https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/util/Pow2.java */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; public final class Pow2 { private Pow2() { diff --git a/src/main/java/io/reactivex/internal/util/QueueDrain.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java similarity index 96% rename from src/main/java/io/reactivex/internal/util/QueueDrain.java rename to src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java index c652092d29..4a84e5e6ed 100644 --- a/src/main/java/io/reactivex/internal/util/QueueDrain.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import org.reactivestreams.Subscriber; diff --git a/src/main/java/io/reactivex/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java similarity index 97% rename from src/main/java/io/reactivex/internal/util/QueueDrainHelper.java rename to src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java index ade0d5fa82..41906b9cf7 100644 --- a/src/main/java/io/reactivex/internal/util/QueueDrainHelper.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java @@ -10,19 +10,19 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.Queue; import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.*; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; -import io.reactivex.exceptions.*; -import io.reactivex.functions.BooleanSupplier; -import io.reactivex.internal.fuseable.*; -import io.reactivex.internal.queue.*; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.exceptions.*; +import io.reactivex.rxjava3.functions.BooleanSupplier; +import io.reactivex.rxjava3.internal.fuseable.*; +import io.reactivex.rxjava3.internal.queue.*; /** * Utility class to help with the queue-drain serialization idiom. diff --git a/src/main/java/io/reactivex/internal/util/SorterFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java similarity index 91% rename from src/main/java/io/reactivex/internal/util/SorterFunction.java rename to src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java index 33ef0ec927..5a9929f604 100644 --- a/src/main/java/io/reactivex/internal/util/SorterFunction.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java @@ -11,11 +11,11 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; public final class SorterFunction implements Function, List> { diff --git a/src/main/java/io/reactivex/internal/util/SuppressAnimalSniffer.java b/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java similarity index 95% rename from src/main/java/io/reactivex/internal/util/SuppressAnimalSniffer.java rename to src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java index af3ca03e40..e57d883036 100644 --- a/src/main/java/io/reactivex/internal/util/SuppressAnimalSniffer.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.lang.annotation.*; diff --git a/src/main/java/io/reactivex/internal/util/VolatileSizeArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java similarity index 98% rename from src/main/java/io/reactivex/internal/util/VolatileSizeArrayList.java rename to src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java index 45744c991f..301dc634fa 100644 --- a/src/main/java/io/reactivex/internal/util/VolatileSizeArrayList.java +++ b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java @@ -11,7 +11,7 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.internal.util; +package io.reactivex.rxjava3.internal.util; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/io/reactivex/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java similarity index 96% rename from src/main/java/io/reactivex/observables/ConnectableObservable.java rename to src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java index a0262f9e5f..135f183ceb 100644 --- a/src/main/java/io/reactivex/observables/ConnectableObservable.java +++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java @@ -11,19 +11,19 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.observables; +package io.reactivex.rxjava3.observables; import java.util.concurrent.TimeUnit; -import io.reactivex.*; -import io.reactivex.annotations.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.operators.observable.*; -import io.reactivex.internal.util.ConnectConsumer; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.annotations.*; +import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.operators.observable.*; +import io.reactivex.rxjava3.internal.util.ConnectConsumer; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * A {@code ConnectableObservable} resembles an ordinary {@link Observable}, except that it does not begin diff --git a/src/main/java/io/reactivex/observables/GroupedObservable.java b/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java similarity index 90% rename from src/main/java/io/reactivex/observables/GroupedObservable.java rename to src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java index 75518a8c6d..489ee1d716 100644 --- a/src/main/java/io/reactivex/observables/GroupedObservable.java +++ b/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java @@ -10,10 +10,10 @@ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.observables; +package io.reactivex.rxjava3.observables; -import io.reactivex.Observable; -import io.reactivex.annotations.Nullable; +import io.reactivex.rxjava3.annotations.Nullable; +import io.reactivex.rxjava3.core.Observable; /** * An {@link Observable} that has been grouped by key, the value of which can be obtained with {@link #getKey()}. @@ -27,7 +27,7 @@ * the type of the key * @param * the type of the items emitted by the {@code GroupedObservable} - * @see Observable#groupBy(io.reactivex.functions.Function) + * @see Observable#groupBy(io.reactivex.rxjava3.functions.Function) * @see ReactiveX documentation: GroupBy */ public abstract class GroupedObservable extends Observable { diff --git a/src/main/java/io/reactivex/observables/package-info.java b/src/main/java/io/reactivex/rxjava3/observables/package-info.java similarity index 79% rename from src/main/java/io/reactivex/observables/package-info.java rename to src/main/java/io/reactivex/rxjava3/observables/package-info.java index 1cfff8c889..7fb2fc1454 100644 --- a/src/main/java/io/reactivex/observables/package-info.java +++ b/src/main/java/io/reactivex/rxjava3/observables/package-info.java @@ -16,7 +16,7 @@ /** * Classes supporting the Observable base reactive class: - * {@link io.reactivex.observables.ConnectableObservable} and - * {@link io.reactivex.observables.GroupedObservable}. + * {@link io.reactivex.rxjava3.observables.ConnectableObservable} and + * {@link io.reactivex.rxjava3.observables.GroupedObservable}. */ -package io.reactivex.observables; +package io.reactivex.rxjava3.observables; diff --git a/src/main/java/io/reactivex/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java similarity index 98% rename from src/main/java/io/reactivex/observers/BaseTestConsumer.java rename to src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java index 958c0063af..ee2dcf1853 100644 --- a/src/main/java/io/reactivex/observers/BaseTestConsumer.java +++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java @@ -11,15 +11,15 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.observers; +package io.reactivex.rxjava3.observers; import java.util.*; import java.util.concurrent.*; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.functions.Predicate; -import io.reactivex.internal.functions.*; -import io.reactivex.internal.util.*; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.functions.Predicate; +import io.reactivex.rxjava3.internal.functions.*; +import io.reactivex.rxjava3.internal.util.*; /** * Base class with shared infrastructure to support TestSubscriber and TestObserver. diff --git a/src/main/java/io/reactivex/observers/DefaultObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java similarity index 84% rename from src/main/java/io/reactivex/observers/DefaultObserver.java rename to src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java index 144cea72ae..42cd69e79c 100644 --- a/src/main/java/io/reactivex/observers/DefaultObserver.java +++ b/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java @@ -11,16 +11,16 @@ * the License for the specific language governing permissions and limitations under the License. */ -package io.reactivex.observers; +package io.reactivex.rxjava3.observers; -import io.reactivex.Observer; -import io.reactivex.annotations.NonNull; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.DisposableHelper; -import io.reactivex.internal.util.EndConsumerHelper; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.DisposableHelper; +import io.reactivex.rxjava3.internal.util.EndConsumerHelper; /** - * Abstract base implementation of an {@link io.reactivex.Observer Observer} with support for cancelling a + * Abstract base implementation of an {@link io.reactivex.rxjava3.core.Observer Observer} with support for cancelling a * subscription via {@link #cancel()} (synchronously) and calls {@link #onStart()} * when the subscription happens. * @@ -35,7 +35,7 @@ * *

    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)} * and {@link #onComplete()} are not allowed to throw any unchecked exceptions. - * If for some reason this can't be avoided, use {@link io.reactivex.Observable#safeSubscribe(io.reactivex.Observer)} + * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Observable#safeSubscribe(io.reactivex.rxjava3.core.Observer)} * instead of the standard {@code subscribe()} method. * *

    Example

    
diff --git a/src/main/java/io/reactivex/observers/DisposableCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
similarity index 88%
rename from src/main/java/io/reactivex/observers/DisposableCompletableObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
index 5ec519492c..25926663d5 100644
--- a/src/main/java/io/reactivex/observers/DisposableCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.CompletableObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.CompletableObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link CompletableObserver} that allows asynchronous cancellation by implementing Disposable.
diff --git a/src/main/java/io/reactivex/observers/DisposableMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/observers/DisposableMaybeObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
index 6cff241c22..66ac6a8620 100644
--- a/src/main/java/io/reactivex/observers/DisposableMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.MaybeObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.MaybeObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link MaybeObserver} that allows asynchronous cancellation by implementing Disposable.
@@ -27,7 +27,7 @@
  * 
    All pre-implemented final methods are thread-safe.
  *
  * 
    Note that {@link #onSuccess(Object)}, {@link #onError(Throwable)} and {@link #onComplete()} are
- * exclusive to each other, unlike a regular {@link io.reactivex.Observer Observer}, and
+ * exclusive to each other, unlike a regular {@link io.reactivex.rxjava3.core.Observer Observer}, and
  * {@code onComplete()} is never called after an {@code onSuccess()}.
  *
  * 
    Like all other consumers, {@code DisposableMaybeObserver} can be subscribed only once.
diff --git a/src/main/java/io/reactivex/observers/DisposableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
similarity index 88%
rename from src/main/java/io/reactivex/observers/DisposableObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
index dccd973549..a15587317c 100644
--- a/src/main/java/io/reactivex/observers/DisposableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link Observer} that allows asynchronous cancellation by implementing Disposable.
@@ -35,7 +35,7 @@
  *
  * 
    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)}
  * and {@link #onComplete()} are not allowed to throw any unchecked exceptions.
- * If for some reason this can't be avoided, use {@link io.reactivex.Observable#safeSubscribe(io.reactivex.Observer)}
+ * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Observable#safeSubscribe(io.reactivex.rxjava3.core.Observer)}
  * instead of the standard {@code subscribe()} method.
  *
  * 
    Example
    
diff --git a/src/main/java/io/reactivex/observers/DisposableSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/observers/DisposableSingleObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
index 38224e0668..6d8ce73fb0 100644
--- a/src/main/java/io/reactivex/observers/DisposableSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.SingleObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.SingleObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link SingleObserver} that allows asynchronous cancellation by implementing Disposable.
diff --git a/src/main/java/io/reactivex/observers/LambdaConsumerIntrospection.java b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
similarity index 97%
rename from src/main/java/io/reactivex/observers/LambdaConsumerIntrospection.java
rename to src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
index 31588ab0c9..5d74ac5e8c 100644
--- a/src/main/java/io/reactivex/observers/LambdaConsumerIntrospection.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 /**
  * An interface that indicates that the implementing type is composed of individual components and exposes information
diff --git a/src/main/java/io/reactivex/observers/ResourceCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/observers/ResourceCompletableObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
index ead4570ff9..3a7ab322a6 100644
--- a/src/main/java/io/reactivex/observers/ResourceCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.CompletableObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.CompletableObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link CompletableObserver} that allows asynchronous cancellation of its subscription and associated resources.
@@ -36,10 +36,10 @@
  * 
    To release the associated resources, one has to call {@link #dispose()}
  * in {@code onError()} and {@code onComplete()} explicitly.
  *
- * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.disposables.Disposable Disposable}s)
+ * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.rxjava3.disposables.Disposable Disposable}s)
  * with this {@code ResourceCompletableObserver} that will be cleaned up when {@link #dispose()} is called.
  * Removing previously associated resources is not possible but one can create a
- * {@link io.reactivex.disposables.CompositeDisposable CompositeDisposable}, associate it with this
+ * {@link io.reactivex.rxjava3.disposables.CompositeDisposable CompositeDisposable}, associate it with this
  * {@code ResourceCompletableObserver} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
diff --git a/src/main/java/io/reactivex/observers/ResourceMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/observers/ResourceMaybeObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
index ca603cf3b0..f824d3c97a 100644
--- a/src/main/java/io/reactivex/observers/ResourceMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.MaybeObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.MaybeObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link MaybeObserver} that allows asynchronous cancellation of its subscription and associated resources.
@@ -28,7 +28,7 @@
  * 
    All pre-implemented final methods are thread-safe.
  *
  * 
    Note that {@link #onSuccess(Object)}, {@link #onError(Throwable)} and {@link #onComplete()} are
- * exclusive to each other, unlike a regular {@link io.reactivex.Observer Observer}, and
+ * exclusive to each other, unlike a regular {@link io.reactivex.rxjava3.core.Observer Observer}, and
  * {@code onComplete()} is never called after an {@code onSuccess()}.
  *
  * 
    Override the protected {@link #onStart()} to perform initialization when this
@@ -40,10 +40,10 @@
  * 
    To release the associated resources, one has to call {@link #dispose()}
  * in {@code onSuccess()}, {@code onError()} and {@code onComplete()} explicitly.
  *
- * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.disposables.Disposable Disposable}s)
+ * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.rxjava3.disposables.Disposable Disposable}s)
  * with this {@code ResourceMaybeObserver} that will be cleaned up when {@link #dispose()} is called.
  * Removing previously associated resources is not possible but one can create a
- * {@link io.reactivex.disposables.CompositeDisposable CompositeDisposable}, associate it with this
+ * {@link io.reactivex.rxjava3.disposables.CompositeDisposable CompositeDisposable}, associate it with this
  * {@code ResourceMaybeObserver} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
diff --git a/src/main/java/io/reactivex/observers/ResourceObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
similarity index 88%
rename from src/main/java/io/reactivex/observers/ResourceObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
index f30d4475df..04f2959595 100644
--- a/src/main/java/io/reactivex/observers/ResourceObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link Observer} that allows asynchronous cancellation of its subscription and associated resources.
@@ -30,10 +30,10 @@
  * 
    To release the associated resources, one has to call {@link #dispose()}
  * in {@code onError()} and {@code onComplete()} explicitly.
  *
- * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.disposables.Disposable Disposable}s)
+ * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.rxjava3.disposables.Disposable Disposable}s)
  * with this {@code ResourceObserver} that will be cleaned up when {@link #dispose()} is called.
  * Removing previously associated resources is not possible but one can create a
- * {@link io.reactivex.disposables.CompositeDisposable CompositeDisposable}, associate it with this
+ * {@link io.reactivex.rxjava3.disposables.CompositeDisposable CompositeDisposable}, associate it with this
  * {@code ResourceObserver} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
@@ -46,7 +46,7 @@
  *
  * 
    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)}
  * and {@link #onComplete()} are not allowed to throw any unchecked exceptions.
- * If for some reason this can't be avoided, use {@link io.reactivex.Observable#safeSubscribe(io.reactivex.Observer)}
+ * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Observable#safeSubscribe(io.reactivex.rxjava3.core.Observer)}
  * instead of the standard {@code subscribe()} method.
  *
  * 
    Example
    
diff --git a/src/main/java/io/reactivex/observers/ResourceSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/observers/ResourceSingleObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
index 2f533b8d99..fe8075f75a 100644
--- a/src/main/java/io/reactivex/observers/ResourceSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.SingleObserver;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.SingleObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract {@link SingleObserver} that allows asynchronous cancellation of its subscription
@@ -37,10 +37,10 @@
  * 
    To release the associated resources, one has to call {@link #dispose()}
  * in {@code onSuccess()} and {@code onError()} explicitly.
  *
- * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.disposables.Disposable Disposable}s)
+ * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.rxjava3.disposables.Disposable Disposable}s)
  * with this {@code ResourceSingleObserver} that will be cleaned up when {@link #dispose()} is called.
  * Removing previously associated resources is not possible but one can create a
- * {@link io.reactivex.disposables.CompositeDisposable CompositeDisposable}, associate it with this
+ * {@link io.reactivex.rxjava3.disposables.CompositeDisposable CompositeDisposable}, associate it with this
  * {@code ResourceSingleObserver} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
diff --git a/src/main/java/io/reactivex/observers/SafeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
similarity index 95%
rename from src/main/java/io/reactivex/observers/SafeObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
index 77dbfb20da..2cb94eab52 100644
--- a/src/main/java/io/reactivex/observers/SafeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.observers;
-
-import io.reactivex.Observer;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.plugins.RxJavaPlugins;
+package io.reactivex.rxjava3.observers;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Wraps another Subscriber and ensures all onXXX methods conform the protocol
diff --git a/src/main/java/io/reactivex/observers/SerializedObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
similarity index 94%
rename from src/main/java/io/reactivex/observers/SerializedObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
index 703f024c03..7146335706 100644
--- a/src/main/java/io/reactivex/observers/SerializedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.observers;
-
-import io.reactivex.Observer;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
+package io.reactivex.rxjava3.observers;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Serializes access to the onNext, onError and onComplete methods of another Observer.
diff --git a/src/main/java/io/reactivex/observers/TestObserver.java b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
similarity index 96%
rename from src/main/java/io/reactivex/observers/TestObserver.java
rename to src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
index 296d738afe..eae4fe113e 100644
--- a/src/main/java/io/reactivex/observers/TestObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
@@ -10,13 +10,13 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
 /**
  * An Observer that records events and allows making assertions about them.
diff --git a/src/main/java/io/reactivex/observers/package-info.java b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
similarity index 70%
rename from src/main/java/io/reactivex/observers/package-info.java
rename to src/main/java/io/reactivex/rxjava3/observers/package-info.java
index d12329ab03..89596573d4 100644
--- a/src/main/java/io/reactivex/observers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
@@ -17,8 +17,8 @@
 /**
  * Default wrappers and implementations for Observer-based consumer classes and interfaces,
  * including disposable and resource-tracking variants and
- * the {@link io.reactivex.observers.TestObserver} that allows unit testing
- * {@link io.reactivex.Observable}-, {@link io.reactivex.Single}-, {@link io.reactivex.Maybe}-
- * and {@link io.reactivex.Completable}-based flows.
+ * the {@link io.reactivex.rxjava3.observers.TestObserver} that allows unit testing
+ * {@link io.reactivex.rxjava3.core.Observable}-, {@link io.reactivex.rxjava3.core.Single}-, {@link io.reactivex.rxjava3.core.Maybe}-
+ * and {@link io.reactivex.rxjava3.core.Completable}-based flows.
  */
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
diff --git a/src/main/java/io/reactivex/parallel/ParallelFailureHandling.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
similarity index 93%
rename from src/main/java/io/reactivex/parallel/ParallelFailureHandling.java
rename to src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
index 867c7496b5..9e78d698e8 100644
--- a/src/main/java/io/reactivex/parallel/ParallelFailureHandling.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
@@ -11,9 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 /**
  * Enumerations for handling failure within a parallel operator.
diff --git a/src/main/java/io/reactivex/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
similarity index 98%
rename from src/main/java/io/reactivex/parallel/ParallelFlowable.java
rename to src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index ce859a5326..38d3505337 100644
--- a/src/main/java/io/reactivex/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import java.util.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.*;
-import io.reactivex.internal.operators.parallel.*;
-import io.reactivex.internal.subscriptions.EmptySubscription;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.*;
+import io.reactivex.rxjava3.internal.operators.parallel.*;
+import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Abstract base class for Parallel publishers that take an array of Subscribers.
diff --git a/src/main/java/io/reactivex/parallel/ParallelFlowableConverter.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
similarity index 93%
rename from src/main/java/io/reactivex/parallel/ParallelFlowableConverter.java
rename to src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
index ddb8d7a545..ea2d07502a 100644
--- a/src/main/java/io/reactivex/parallel/ParallelFlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
@@ -11,9 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
-import io.reactivex.annotations.*;
+import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
  * Convenience interface and callback used by the {@link ParallelFlowable#to} operator to turn a ParallelFlowable into
diff --git a/src/main/java/io/reactivex/parallel/ParallelTransformer.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
similarity index 93%
rename from src/main/java/io/reactivex/parallel/ParallelTransformer.java
rename to src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
index 9981934867..1a918f0835 100644
--- a/src/main/java/io/reactivex/parallel/ParallelTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
@@ -11,9 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
-import io.reactivex.annotations.*;
+import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
  * Interface to compose ParallelFlowable.
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/package-info.java b/src/main/java/io/reactivex/rxjava3/parallel/package-info.java
new file mode 100644
index 0000000000..7c9cc785ad
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/parallel/package-info.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Contains the base type {@link io.reactivex.rxjava3.parallel.ParallelFlowable},
+ * a sub-DSL for working with {@link io.reactivex.rxjava3.core.Flowable} sequences in parallel.
+ */
+package io.reactivex.rxjava3.parallel;
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
similarity index 98%
rename from src/main/java/io/reactivex/plugins/RxJavaPlugins.java
rename to src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 8c696711ac..380c496681 100644
--- a/src/main/java/io/reactivex/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -10,24 +10,24 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.plugins;
+package io.reactivex.rxjava3.plugins;
 
 import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.concurrent.*;
+import java.util.concurrent.ThreadFactory;
 
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.schedulers.*;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.parallel.ParallelFlowable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.schedulers.*;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 /**
  * Utility class to inject handlers to certain standard RxJava operations.
  */
diff --git a/src/main/java/io/reactivex/plugins/package-info.java b/src/main/java/io/reactivex/rxjava3/plugins/package-info.java
similarity index 84%
rename from src/main/java/io/reactivex/plugins/package-info.java
rename to src/main/java/io/reactivex/rxjava3/plugins/package-info.java
index 3031129387..a3105506a4 100644
--- a/src/main/java/io/reactivex/plugins/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Contains the central plugin handler {@link io.reactivex.plugins.RxJavaPlugins}
+ * Contains the central plugin handler {@link io.reactivex.rxjava3.plugins.RxJavaPlugins}
  * class to hook into the lifecycle of the base reactive types and schedulers.
  */
-package io.reactivex.plugins;
+package io.reactivex.rxjava3.plugins;
diff --git a/src/main/java/io/reactivex/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
similarity index 94%
rename from src/main/java/io/reactivex/processors/AsyncProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 3cce2ee466..7d5e84a8f2 100644
--- a/src/main/java/io/reactivex/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -10,16 +10,16 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.reactivestreams.*;
 
-import io.reactivex.annotations.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.subscriptions.DeferredScalarSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Processor that emits the very last value followed by a completion event or the received error
@@ -35,7 +35,7 @@
  * as parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the processor's state is not changed.
  * 
    
- * {@code AsyncProcessor} is a {@link io.reactivex.Flowable} as well as a {@link FlowableProcessor} and supports backpressure from the downstream but
+ * {@code AsyncProcessor} is a {@link io.reactivex.rxjava3.core.Flowable} as well as a {@link FlowableProcessor} and supports backpressure from the downstream but
  * its {@link Subscriber}-side consumes items in an unbounded manner.
  * 
    
  * When this {@code AsyncProcessor} is terminated via {@link #onError(Throwable)}, the
@@ -67,12 +67,12 @@
  *  
    Backpressure:
    
  *  
    The {@code AsyncProcessor} honors the backpressure of the downstream {@code Subscriber}s and won't emit
  *  its single value to a particular {@code Subscriber} until that {@code Subscriber} has requested an item.
- *  When the {@code AsyncProcessor} is subscribed to a {@link io.reactivex.Flowable}, the processor consumes this
+ *  When the {@code AsyncProcessor} is subscribed to a {@link io.reactivex.rxjava3.core.Flowable}, the processor consumes this
  *  {@code Flowable} in an unbounded manner (requesting `Long.MAX_VALUE`) as only the very last upstream item is
  *  retained by it.
  *  
    
  *  
    Scheduler:
    
- *  
    {@code AsyncProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code AsyncProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on the thread where the terminating {@code onError} or {@code onComplete}
  *  methods were invoked.
    
  *  
    Error handling:
    
@@ -80,7 +80,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code Subscriber}s. During this emission,
  *  if one or more {@code Subscriber}s dispose their respective {@code Subscription}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
  *  cancel at once).
  *  If there were no {@code Subscriber}s subscribed to this {@code AsyncProcessor} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
similarity index 97%
rename from src/main/java/io/reactivex/processors/BehaviorProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 74ef0041eb..cf212214b7 100644
--- a/src/main/java/io/reactivex/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.annotations.*;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.*;
-import io.reactivex.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Processor that emits the most recent item it has observed and all subsequent observed items to each subscribed
@@ -110,14 +110,14 @@
  *  If the {@code BehaviorProcessor} is (optionally) subscribed to another {@code Publisher}, this upstream
  *  {@code Publisher} is consumed in an unbounded fashion (requesting {@code Long.MAX_VALUE}).
  *  
    Scheduler:
    
- *  
    {@code BehaviorProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code BehaviorProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code BehaviorProcessor} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the last set of {@code Subscriber}s. During this emission,
  *  if one or more {@code Subscriber}s cancel their respective {@code Subscription}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
  *  cancel at once).
  *  If there were no {@code Subscriber}s subscribed to this {@code BehaviorProcessor} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/processors/FlowableProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
similarity index 96%
rename from src/main/java/io/reactivex/processors/FlowableProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
index 8135afa784..abe5e2ad08 100644
--- a/src/main/java/io/reactivex/processors/FlowableProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import org.reactivestreams.Processor;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
 
 /**
  * Represents a Subscriber and a Flowable (Publisher) at the same time, allowing
diff --git a/src/main/java/io/reactivex/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
similarity index 96%
rename from src/main/java/io/reactivex/processors/MulticastProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 317244313f..7d613a0939 100644
--- a/src/main/java/io/reactivex/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.annotations.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.queue.*;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.queue.*;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A {@link FlowableProcessor} implementation that coordinates downstream requests through
@@ -37,12 +37,12 @@
  * allow configuring it:
  * 
      
  * 
    • {@link #create()}: create an empty {@code MulticastProcessor} with
- *      {@link io.reactivex.Flowable#bufferSize() Flowable.bufferSize()} prefetch amount
+ *      {@link io.reactivex.rxjava3.core.Flowable#bufferSize() Flowable.bufferSize()} prefetch amount
  *      and no reference counting behavior.
      • 
  * 
    • {@link #create(int)}: create an empty {@code MulticastProcessor} with
  *      the given prefetch amount and no reference counting behavior.
      • 
  * 
    • {@link #create(boolean)}: create an empty {@code MulticastProcessor} with
- *      {@link io.reactivex.Flowable#bufferSize() Flowable.bufferSize()} prefetch amount
+ *      {@link io.reactivex.rxjava3.core.Flowable#bufferSize() Flowable.bufferSize()} prefetch amount
  *      and an optional reference counting behavior.
      • 
  * 
    • {@link #create(int, boolean)}: create an empty {@code MulticastProcessor} with
  *      the given prefetch amount and an optional reference counting behavior.
      • 
@@ -66,7 +66,7 @@
  * parameters to {@link #onSubscribe(Subscription)}, {@link #offer(Object)}, {@link #onNext(Object)} and {@link #onError(Throwable)}.
  * Such calls will result in a {@link NullPointerException} being thrown and the processor's state is not changed.
  * 
      
- * Since a {@code MulticastProcessor} is a {@link io.reactivex.Flowable}, it supports backpressure.
+ * Since a {@code MulticastProcessor} is a {@link io.reactivex.rxjava3.core.Flowable}, it supports backpressure.
  * The backpressure from the currently subscribed {@link Subscriber}s are coordinated by emitting upstream
  * items only if all of those {@code Subscriber}s have requested at least one item. This behavior
  * is also called lockstep-mode because even if some {@code Subscriber}s can take any number
@@ -96,7 +96,7 @@
  *  of items, other {@code Subscriber}s requesting less or infrequently will slow down the overall
  *  throughput of the flow.
    
  *  
    Scheduler:
    
- *  
    {@code MulticastProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code MulticastProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on an arbitrary thread in a serialized fashion.
    
  * 
  * 
    
diff --git a/src/main/java/io/reactivex/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
similarity index 95%
rename from src/main/java/io/reactivex/processors/PublishProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 878ae92cbe..54c85a6097 100644
--- a/src/main/java/io/reactivex/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -10,18 +10,18 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.annotations.*;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.BackpressureHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Processor that multicasts all subsequently observed items to its current {@link Subscriber}s.
@@ -37,7 +37,7 @@
  * parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the processor's state is not changed.
  * 
    
- * {@code PublishProcessor} is a {@link io.reactivex.Flowable} as well as a {@link FlowableProcessor},
+ * {@code PublishProcessor} is a {@link io.reactivex.rxjava3.core.Flowable} as well as a {@link FlowableProcessor},
  * however, it does not coordinate backpressure between different subscribers and between an
  * upstream source and a subscriber. If an upstream item is received via {@link #onNext(Object)}, if
  * a subscriber is not ready to receive an item, that subscriber is terminated via a {@link MissingBackpressureException}.
@@ -76,14 +76,14 @@
  *  to multiple sources (note on serialization though) unlike the standard {@code Subscriber} contract. Child subscribers, however, are not overflown but receive an
  *  {@link IllegalStateException} in case their requested amount is zero.
  *  
    Scheduler:
    
- *  
    {@code PublishProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code PublishProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code PublishProcessor} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the last set of {@code Subscriber}s. During this emission,
  *  if one or more {@code Subscriber}s cancel their respective {@code Subscription}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
  *  cancel at once).
  *  If there were no {@code Subscriber}s subscribed to this {@code PublishProcessor} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
similarity index 98%
rename from src/main/java/io/reactivex/processors/ReplayProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index b04a17d07e..988ff4418d 100644
--- a/src/main/java/io/reactivex/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import java.lang.reflect.Array;
 import java.util.*;
@@ -20,12 +20,12 @@
 
 import org.reactivestreams.*;
 
-import io.reactivex.Scheduler;
-import io.reactivex.annotations.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Replays events to Subscribers.
@@ -108,7 +108,7 @@
  *  Note that {@code Subscriber}s receive a continuous sequence of values after they subscribed even
  *  if an individual item gets delayed due to backpressure.
    
  *  
    Scheduler:
    
- *  
    {@code ReplayProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code ReplayProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on the thread the respective {@code onXXX} methods were invoked.
  *  Time-bound {@code ReplayProcessor}s use the given {@code Scheduler} in their {@code create} methods
  *  as time source to timestamp of items received for the age checks.
    
@@ -117,7 +117,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code Subscriber}s. During this emission,
  *  if one or more {@code Subscriber}s cancel their respective {@code Subscription}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Subscriber}s
  *  cancel at once).
  *  If there were no {@code Subscriber}s subscribed to this {@code ReplayProcessor} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/processors/SerializedProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
similarity index 96%
rename from src/main/java/io/reactivex/processors/SerializedProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
index 8c0a37e02a..6096398618 100644
--- a/src/main/java/io/reactivex/processors/SerializedProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
-import io.reactivex.annotations.Nullable;
 import org.reactivestreams.*;
 
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Serializes calls to the Subscriber methods.
diff --git a/src/main/java/io/reactivex/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
similarity index 96%
rename from src/main/java/io/reactivex/processors/UnicastProcessor.java
rename to src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index 94547b88fb..31b9f4aca4 100644
--- a/src/main/java/io/reactivex/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -11,21 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
-import io.reactivex.annotations.CheckReturnValue;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.annotations.Nullable;
-import io.reactivex.annotations.NonNull;
 import org.reactivestreams.*;
 
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.fuseable.QueueSubscription;
-import io.reactivex.internal.queue.SpscLinkedArrayQueue;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.internal.util.BackpressureHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A {@link FlowableProcessor} variant that queues up events until a single {@link Subscriber} subscribes to it, replays
@@ -67,7 +65,7 @@
  * parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the processor's state is not changed.
  * 
    
- * Since a {@code UnicastProcessor} is a {@link io.reactivex.Flowable} as well as a {@link FlowableProcessor}, it
+ * Since a {@code UnicastProcessor} is a {@link io.reactivex.rxjava3.core.Flowable} as well as a {@link FlowableProcessor}, it
  * honors the downstream backpressure but consumes an upstream source in an unbounded manner (requesting {@code Long.MAX_VALUE}).
  * 
    
  * When this {@code UnicastProcessor} is terminated via {@link #onError(Throwable)} the current or late single {@code Subscriber}
@@ -94,14 +92,14 @@
  *  
    {@code UnicastProcessor} honors the downstream backpressure but consumes an upstream source
  *  (if any) in an unbounded manner (requesting {@code Long.MAX_VALUE}).
    
  *  
    Scheduler:
    
- *  
    {@code UnicastProcessor} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code UnicastProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the single {@code Subscriber} gets notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code UnicastProcessor} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the current single {@code Subscriber}. During this emission,
  *  if the single {@code Subscriber}s cancels its respective {@code Subscription}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}.
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}.
  *  If there were no {@code Subscriber}s subscribed to this {@code UnicastProcessor} when the {@code onError()}
  *  was called, the global error handler is not invoked.
  *  
    
diff --git a/src/main/java/io/reactivex/processors/package-info.java b/src/main/java/io/reactivex/rxjava3/processors/package-info.java
similarity index 51%
rename from src/main/java/io/reactivex/processors/package-info.java
rename to src/main/java/io/reactivex/rxjava3/processors/package-info.java
index b6a619372f..be2bb7c954 100644
--- a/src/main/java/io/reactivex/processors/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/package-info.java
@@ -16,7 +16,7 @@
 
 /**
  * Classes representing so-called hot backpressure-aware sources, aka processors,
- * that implement the {@link io.reactivex.processors.FlowableProcessor FlowableProcessor} class,
+ * that implement the {@link io.reactivex.rxjava3.processors.FlowableProcessor FlowableProcessor} class,
  * the Reactive Streams {@link org.reactivestreams.Processor Processor} interface
  * to allow forms of multicasting events to one or more subscribers as well as consuming another
  * Reactive Streams {@link org.reactivestreams.Publisher Publisher}.
@@ -24,16 +24,16 @@
  * Available processor implementations:
  * 
    
  * 
      
- *     
    • {@link io.reactivex.processors.AsyncProcessor AsyncProcessor} - replays the very last item
      • 
- *     
    • {@link io.reactivex.processors.BehaviorProcessor BehaviorProcessor} - remembers the latest item
      • 
- *     
    • {@link io.reactivex.processors.MulticastProcessor MulticastProcessor} - coordinates its source with its consumers
      • 
- *     
    • {@link io.reactivex.processors.PublishProcessor PublishProcessor} - dispatches items to current consumers
      • 
- *     
    • {@link io.reactivex.processors.ReplayProcessor ReplayProcessor} - remembers some or all items and replays them to consumers
      • 
- *     
    • {@link io.reactivex.processors.UnicastProcessor UnicastProcessor} - remembers or relays items to a single consumer
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.AsyncProcessor AsyncProcessor} - replays the very last item
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.BehaviorProcessor BehaviorProcessor} - remembers the latest item
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.MulticastProcessor MulticastProcessor} - coordinates its source with its consumers
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.PublishProcessor PublishProcessor} - dispatches items to current consumers
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.ReplayProcessor ReplayProcessor} - remembers some or all items and replays them to consumers
      • 
+ *     
    • {@link io.reactivex.rxjava3.processors.UnicastProcessor UnicastProcessor} - remembers or relays items to a single consumer
      • 
  * 
    
  * 
    
  * The non-backpressured variants of the {@code FlowableProcessor} class are called
- * {@link io.reactivex.subjects.Subject}s and reside in the {@code io.reactivex.subjects} package.
- * @see io.reactivex.subjects
+ * {@link io.reactivex.rxjava3.subjects.Subject}s and reside in the {@code io.reactivex.subjects} package.
+ * @see io.reactivex.rxjava3.subjects
  */
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
diff --git a/src/main/java/io/reactivex/schedulers/SchedulerRunnableIntrospection.java b/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
similarity index 80%
rename from src/main/java/io/reactivex/schedulers/SchedulerRunnableIntrospection.java
rename to src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
index aa930e4f97..aec3170138 100644
--- a/src/main/java/io/reactivex/schedulers/SchedulerRunnableIntrospection.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
@@ -8,18 +8,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
-import io.reactivex.annotations.*;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Interface to indicate the implementor class wraps a {@code Runnable} that can
  * be accessed via {@link #getWrappedRunnable()}.
  * 
    
- * You can check if a {@link Runnable} task submitted to a {@link io.reactivex.Scheduler Scheduler} (or its
- * {@link io.reactivex.Scheduler.Worker Scheduler.Worker}) implements this interface and unwrap the
+ * You can check if a {@link Runnable} task submitted to a {@link io.reactivex.rxjava3.core.Scheduler Scheduler} (or its
+ * {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}) implements this interface and unwrap the
  * original {@code Runnable} instance. This could help to avoid hooking the same underlying {@code Runnable}
  * task in a custom {@link RxJavaPlugins#onSchedule(Runnable)} hook set via
  * the {@link RxJavaPlugins#setScheduleHandler(Function)} method multiple times due to internal delegation
diff --git a/src/main/java/io/reactivex/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
similarity index 89%
rename from src/main/java/io/reactivex/schedulers/Schedulers.java
rename to src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 3e6a988974..98189e8e6f 100644
--- a/src/main/java/io/reactivex/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import java.util.concurrent.*;
 
-import io.reactivex.Scheduler;
-import io.reactivex.annotations.*;
-import io.reactivex.functions.Supplier;
-import io.reactivex.internal.schedulers.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.internal.schedulers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Static factory methods for returning standard Scheduler instances.
@@ -101,7 +101,7 @@ private Schedulers() {
      * 
    
      * Unhandled errors will be delivered to the scheduler Thread's {@link java.lang.Thread.UncaughtExceptionHandler}.
      * 
    
-     * This type of scheduler is less sensitive to leaking {@link io.reactivex.Scheduler.Worker} instances, although
+     * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * 
    
@@ -117,18 +117,18 @@ private Schedulers() {
      * 
      * 
    
      * The default value of this scheduler can be overridden at initialization time via the
-     * {@link RxJavaPlugins#setInitComputationSchedulerHandler(io.reactivex.functions.Function)} plugin method.
+     * {@link RxJavaPlugins#setInitComputationSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
      * result in a {@code NullPointerException}.
      * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
-     * via the {@link RxJavaPlugins#setComputationSchedulerHandler(io.reactivex.functions.Function)} method.
+     * via the {@link RxJavaPlugins#setComputationSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * 
    
      * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
      * {@link RxJavaPlugins#createComputationScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * 
    Operators on the base reactive classes that use this scheduler are marked with the
-     * @{@link io.reactivex.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.annotations.SchedulerSupport#COMPUTATION COMPUTATION})
+     * @{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#COMPUTATION COMPUTATION})
      * annotation.
      * @return a {@link Scheduler} meant for computation-bound work
      */
@@ -144,10 +144,10 @@ public static Scheduler computation() {
      * 
    
      * The implementation is backed by a pool of single-threaded {@link ScheduledExecutorService} instances
      * that will try to reuse previously started instances used by the worker
-     * returned by {@link io.reactivex.Scheduler#createWorker()} but otherwise will start a new backing
+     * returned by {@link io.reactivex.rxjava3.core.Scheduler#createWorker()} but otherwise will start a new backing
      * {@link ScheduledExecutorService} instance. Note that this scheduler may create an unbounded number
      * of worker threads that can result in system slowdowns or {@code OutOfMemoryError}. Therefore, for casual uses
-     * or when implementing an operator, the Worker instances must be disposed via {@link io.reactivex.Scheduler.Worker#dispose()}.
+     * or when implementing an operator, the Worker instances must be disposed via {@link io.reactivex.rxjava3.core.Scheduler.Worker#dispose()}.
      * 
    
      * It is not recommended to perform computational work on this scheduler. Use {@link #computation()} instead.
      * 
    
@@ -162,18 +162,18 @@ public static Scheduler computation() {
      * 
      * 
    
      * The default value of this scheduler can be overridden at initialization time via the
-     * {@link RxJavaPlugins#setInitIoSchedulerHandler(io.reactivex.functions.Function)} plugin method.
+     * {@link RxJavaPlugins#setInitIoSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
      * result in a {@code NullPointerException}.
      * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
-     * via the {@link RxJavaPlugins#setIoSchedulerHandler(io.reactivex.functions.Function)} method.
+     * via the {@link RxJavaPlugins#setIoSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * 
    
      * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
      * {@link RxJavaPlugins#createIoScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * 
    Operators on the base reactive classes that use this scheduler are marked with the
-     * @{@link io.reactivex.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.annotations.SchedulerSupport#IO IO})
+     * @{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#IO IO})
      * annotation.
      * @return a {@link Scheduler} meant for IO-bound work
      */
@@ -183,7 +183,7 @@ public static Scheduler io() {
     }
 
     /**
-     * Returns a default, shared {@link Scheduler} instance whose {@link io.reactivex.Scheduler.Worker}
+     * Returns a default, shared {@link Scheduler} instance whose {@link io.reactivex.rxjava3.core.Scheduler.Worker}
      * instances queue work and execute them in a FIFO manner on one of the participating threads.
      * 
    
      * The default implementation's {@link Scheduler#scheduleDirect(Runnable)} methods execute the tasks on the current thread
@@ -208,7 +208,7 @@ public static Scheduler trampoline() {
      * each invocation of the {@link Scheduler#scheduleDirect(Runnable)} (plus its overloads) and {@link Scheduler#createWorker()}
      * methods, thus an unbounded number of worker threads may be created that can
      * result in system slowdowns or {@code OutOfMemoryError}. Therefore, for casual uses or when implementing an operator,
-     * the Worker instances must be disposed via {@link io.reactivex.Scheduler.Worker#dispose()}.
+     * the Worker instances must be disposed via {@link io.reactivex.rxjava3.core.Scheduler.Worker#dispose()}.
      * 
    
      * Unhandled errors will be delivered to the scheduler Thread's {@link java.lang.Thread.UncaughtExceptionHandler}.
      * 
    
@@ -220,18 +220,18 @@ public static Scheduler trampoline() {
      * 
      * 
    
      * The default value of this scheduler can be overridden at initialization time via the
-     * {@link RxJavaPlugins#setInitNewThreadSchedulerHandler(io.reactivex.functions.Function)} plugin method.
+     * {@link RxJavaPlugins#setInitNewThreadSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
      * result in a {@code NullPointerException}.
      * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
-     * via the {@link RxJavaPlugins#setNewThreadSchedulerHandler(io.reactivex.functions.Function)} method.
+     * via the {@link RxJavaPlugins#setNewThreadSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * 
    
      * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
      * {@link RxJavaPlugins#createNewThreadScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * 
    Operators on the base reactive classes that use this scheduler are marked with the
-     * @{@link io.reactivex.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.annotations.SchedulerSupport#NEW_THREAD NEW_TRHEAD})
+     * @{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#NEW_THREAD NEW_TRHEAD})
      * annotation.
      * @return a {@link Scheduler} that creates new threads
      */
@@ -254,7 +254,7 @@ public static Scheduler newThread() {
      * 
    
      * Unhandled errors will be delivered to the scheduler Thread's {@link java.lang.Thread.UncaughtExceptionHandler}.
      * 
    
-     * This type of scheduler is less sensitive to leaking {@link io.reactivex.Scheduler.Worker} instances, although
+     * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * 
    
@@ -269,18 +269,18 @@ public static Scheduler newThread() {
      * 
      * 
    
      * The default value of this scheduler can be overridden at initialization time via the
-     * {@link RxJavaPlugins#setInitSingleSchedulerHandler(io.reactivex.functions.Function)} plugin method.
+     * {@link RxJavaPlugins#setInitSingleSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
      * result in a {@code NullPointerException}.
      * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
-     * via the {@link RxJavaPlugins#setSingleSchedulerHandler(io.reactivex.functions.Function)} method.
+     * via the {@link RxJavaPlugins#setSingleSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * 
    
      * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
      * {@link RxJavaPlugins#createSingleScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * 
    Operators on the base reactive classes that use this scheduler are marked with the
-     * @{@link io.reactivex.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.annotations.SchedulerSupport#SINGLE SINGLE})
+     * @{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#SINGLE SINGLE})
      * annotation.
      * @return a {@link Scheduler} that shares a single backing thread.
      * @since 2.0
@@ -300,18 +300,18 @@ public static Scheduler single() {
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * 
    
-     * Tasks submitted to the {@link io.reactivex.Scheduler.Worker Scheduler.Worker} of this {@code Scheduler} are also not interruptible. Use the
+     * Tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} of this {@code Scheduler} are also not interruptible. Use the
      * {@link #from(Executor, boolean)} overload to enable task interruption via this wrapper.
      * 
    
      * If the provided executor supports the standard Java {@link ExecutorService} API,
      * cancelling tasks scheduled by this scheduler can be cancelled/interrupted by calling
-     * {@link io.reactivex.disposables.Disposable#dispose()}. In addition, tasks scheduled with
+     * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * 
    
      * If the provided executor supports the standard Java {@link ScheduledExecutorService} API,
      * cancelling tasks scheduled by this scheduler can be cancelled/interrupted by calling
-     * {@link io.reactivex.disposables.Disposable#dispose()}. In addition, tasks scheduled with
+     * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the provided executor. Note, however, if the provided
      * {@code ScheduledExecutorService} instance is not single threaded, tasks scheduled
      * with a time delay close to each other may end up executing in different order than
@@ -333,7 +333,7 @@ public static Scheduler single() {
      * }
      * 
    
      * 
    
-     * This type of scheduler is less sensitive to leaking {@link io.reactivex.Scheduler.Worker Scheduler.Worker} instances, although
+     * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * 
    
@@ -351,7 +351,7 @@ public static Scheduler from(@NonNull Executor executor) {
      * Wraps an {@link Executor} into a new Scheduler instance and delegates {@code schedule()}
      * calls to it.
      * 
    
-     * The tasks scheduled by the returned {@link Scheduler} and its {@link io.reactivex.Scheduler.Worker Scheduler.Worker}
+     * The tasks scheduled by the returned {@link Scheduler} and its {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}
      * can be optionally interrupted.
      * 
    
      * If the provided executor doesn't support any of the more specific standard Java executor
@@ -361,13 +361,13 @@ public static Scheduler from(@NonNull Executor executor) {
      * 
    
      * If the provided executor supports the standard Java {@link ExecutorService} API,
      * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
-     * {@link io.reactivex.disposables.Disposable#dispose()}. In addition, tasks scheduled with
+     * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * 
    
      * If the provided executor supports the standard Java {@link ScheduledExecutorService} API,
      * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
-     * {@link io.reactivex.disposables.Disposable#dispose()}. In addition, tasks scheduled with
+     * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the provided executor. Note, however, if the provided
      * {@code ScheduledExecutorService} instance is not single threaded, tasks scheduled
      * with a time delay close to each other may end up executing in different order than
@@ -389,7 +389,7 @@ public static Scheduler from(@NonNull Executor executor) {
      * }
      * 
    
      * 
    
-     * This type of scheduler is less sensitive to leaking {@link io.reactivex.Scheduler.Worker Scheduler.Worker} instances, although
+     * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * 
    
@@ -397,7 +397,7 @@ public static Scheduler from(@NonNull Executor executor) {
      * 
    History: 2.2.6 - experimental
      * @param executor
      *          the executor to wrap
-     * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.Scheduler.Worker Scheduler.Worker} will
+     * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
      * be interrupted when the task is disposed.
      * @return the new Scheduler wrapping the Executor
      * @since 3.0.0
diff --git a/src/main/java/io/reactivex/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
similarity index 95%
rename from src/main/java/io/reactivex/schedulers/TestScheduler.java
rename to src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index 44272ffc25..33a5b943e1 100644
--- a/src/main/java/io/reactivex/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import java.util.Queue;
 import java.util.concurrent.*;
 
-import io.reactivex.Scheduler;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * A special, non thread-safe scheduler for testing operators that require
diff --git a/src/main/java/io/reactivex/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
similarity index 94%
rename from src/main/java/io/reactivex/schedulers/Timed.java
rename to src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index a1bd20e4be..b7ac9c828f 100644
--- a/src/main/java/io/reactivex/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.annotations.NonNull;
-import io.reactivex.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Holds onto a value along with time information.
diff --git a/src/main/java/io/reactivex/schedulers/package-info.java b/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
similarity index 72%
rename from src/main/java/io/reactivex/schedulers/package-info.java
rename to src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
index 7ba9d63567..4bbd9e0da2 100644
--- a/src/main/java/io/reactivex/schedulers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 /**
- * Contains notably the factory class of {@link io.reactivex.schedulers.Schedulers Schedulers} providing methods for
- * retrieving the standard scheduler instances, the {@link io.reactivex.schedulers.TestScheduler TestScheduler} for testing flows
- * with scheduling in a controlled manner and the class {@link io.reactivex.schedulers.Timed Timed} that can hold
+ * Contains notably the factory class of {@link io.reactivex.rxjava3.schedulers.Schedulers Schedulers} providing methods for
+ * retrieving the standard scheduler instances, the {@link io.reactivex.rxjava3.schedulers.TestScheduler TestScheduler} for testing flows
+ * with scheduling in a controlled manner and the class {@link io.reactivex.rxjava3.schedulers.Timed Timed} that can hold
  * a value and a timestamp associated with it.
  */
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
diff --git a/src/main/java/io/reactivex/subjects/AsyncSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
similarity index 94%
rename from src/main/java/io/reactivex/subjects/AsyncSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
index 6bc006393d..5190d75013 100644
--- a/src/main/java/io/reactivex/subjects/AsyncSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.observers.DeferredScalarDisposable;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A Subject that emits the very last value followed by a completion event or the received error to Observers.
@@ -35,10 +35,10 @@
  * as parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since an {@code AsyncSubject} is an {@link io.reactivex.Observable}, it does not support backpressure.
+ * Since an {@code AsyncSubject} is an {@link io.reactivex.rxjava3.core.Observable}, it does not support backpressure.
  * 
    
  * When this {@code AsyncSubject} is terminated via {@link #onError(Throwable)}, the
- * last observed item (if any) is cleared and late {@link io.reactivex.Observer}s only receive
+ * last observed item (if any) is cleared and late {@link io.reactivex.rxjava3.core.Observer}s only receive
  * the {@code onError} event.
  * 
    
  * The {@code AsyncSubject} caches the latest item internally and it emits this item only when {@code onComplete} is called.
@@ -64,7 +64,7 @@
  * manner via {@link #hasValue()} or {@link #getValue()}.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code AsyncSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code AsyncSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Observer}s get notified on the thread where the terminating {@code onError} or {@code onComplete}
  *  methods were invoked.
    
  *  
    Error handling:
    
@@ -72,7 +72,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code Observer}s. During this emission,
  *  if one or more {@code Observer}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
  *  cancel at once).
  *  If there were no {@code Observer}s subscribed to this {@code AsyncSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
similarity index 95%
rename from src/main/java/io/reactivex/subjects/BehaviorSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index 417ea310b0..f8f4bb3848 100644
--- a/src/main/java/io/reactivex/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.*;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.*;
-import io.reactivex.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Subject that emits the most recent item it has observed and all subsequent observed items to each subscribed
@@ -41,10 +41,10 @@
  * {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code BehaviorSubject} is an {@link io.reactivex.Observable}, it does not support backpressure.
+ * Since a {@code BehaviorSubject} is an {@link io.reactivex.rxjava3.core.Observable}, it does not support backpressure.
  * 
    
  * When this {@code BehaviorSubject} is terminated via {@link #onError(Throwable)} or {@link #onComplete()}, the
- * last observed item (if any) is cleared and late {@link io.reactivex.Observer}s only receive
+ * last observed item (if any) is cleared and late {@link io.reactivex.rxjava3.core.Observer}s only receive
  * the respective terminal event.
  * 
    
  * The {@code BehaviorSubject} does not support clearing its cached value (to appear empty again), however, the
@@ -97,14 +97,14 @@
  * in a non-blocking and thread-safe manner via {@link #hasValue()} or {@link #getValue()}.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code BehaviorSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code BehaviorSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Observer}s get notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code BehaviorSubject} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the last set of {@code Observer}s. During this emission,
  *  if one or more {@code Observer}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
  *  cancel at once).
  *  If there were no {@code Observer}s subscribed to this {@code BehaviorSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/CompletableSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
similarity index 93%
rename from src/main/java/io/reactivex/subjects/CompletableSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
index 328e35175f..0b369e4b43 100644
--- a/src/main/java/io/reactivex/subjects/CompletableSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
@@ -11,17 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
-import io.reactivex.annotations.Nullable;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.CheckReturnValue;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Represents a hot Completable-like source and consumer of events similar to Subjects.
@@ -43,13 +41,13 @@
  * 
    
  * All methods are thread safe. Calling {@link #onComplete()} multiple
  * times has no effect. Calling {@link #onError(Throwable)} multiple times relays the {@code Throwable} to
- * the {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
+ * the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
  * 
    
  * This {@code CompletableSubject} supports the standard state-peeking methods {@link #hasComplete()},
  * {@link #hasThrowable()}, {@link #getThrowable()} and {@link #hasObservers()}.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code CompletableSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code CompletableSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code CompletableObserver}s get notified on the thread where the terminating {@code onError} or {@code onComplete}
  *  methods were invoked.
    
  *  
    Error handling:
    
@@ -57,7 +55,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code CompletableObserver}s. During this emission,
  *  if one or more {@code CompletableObserver}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code CompletableObserver}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code CompletableObserver}s
  *  cancel at once).
  *  If there were no {@code CompletableObserver}s subscribed to this {@code CompletableSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/MaybeSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
similarity index 94%
rename from src/main/java/io/reactivex/subjects/MaybeSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
index ef9128c4f6..9546783736 100644
--- a/src/main/java/io/reactivex/subjects/MaybeSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Represents a hot Maybe-like source and consumer of events similar to Subjects.
@@ -34,12 +34,12 @@
  * as parameters to  {@link #onSuccess(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code MaybeSubject} is a {@link io.reactivex.Maybe}, calling {@code onSuccess}, {@code onError}
+ * Since a {@code MaybeSubject} is a {@link io.reactivex.rxjava3.core.Maybe}, calling {@code onSuccess}, {@code onError}
  * or {@code onComplete} will move this {@code MaybeSubject} into its terminal state atomically.
  * 
    
  * All methods are thread safe. Calling {@link #onSuccess(Object)} or {@link #onComplete()} multiple
  * times has no effect. Calling {@link #onError(Throwable)} multiple times relays the {@code Throwable} to
- * the {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
+ * the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
  * 
    
  * Even though {@code MaybeSubject} implements the {@code MaybeObserver} interface, calling
  * {@code onSubscribe} is not required (Rule 2.12)
@@ -54,7 +54,7 @@
  * The {@code MaybeSubject} does not support clearing its cached {@code onSuccess} value.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code MaybeSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code MaybeSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code MaybeObserver}s get notified on the thread where the terminating {@code onSuccess}, {@code onError} or {@code onComplete}
  *  methods were invoked.
    
  *  
    Error handling:
    
@@ -62,7 +62,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code MaybeObserver}s. During this emission,
  *  if one or more {@code MaybeObserver}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code MaybeObserver}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code MaybeObserver}s
  *  cancel at once).
  *  If there were no {@code MaybeObserver}s subscribed to this {@code MaybeSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/PublishSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
similarity index 94%
rename from src/main/java/io/reactivex/subjects/PublishSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
index f59ab36754..5c706c5c92 100644
--- a/src/main/java/io/reactivex/subjects/PublishSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
@@ -11,17 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
-import io.reactivex.annotations.CheckReturnValue;
-import io.reactivex.annotations.Nullable;
-import io.reactivex.annotations.NonNull;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A Subject that emits (multicasts) items to currently subscribed {@link Observer}s and terminal events to current
@@ -37,10 +35,10 @@
  * parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code PublishSubject} is an {@link io.reactivex.Observable}, it does not support backpressure.
+ * Since a {@code PublishSubject} is an {@link io.reactivex.rxjava3.core.Observable}, it does not support backpressure.
  * 
    
  * When this {@code PublishSubject} is terminated via {@link #onError(Throwable)} or {@link #onComplete()},
- * late {@link io.reactivex.Observer}s only receive the respective terminal event.
+ * late {@link io.reactivex.rxjava3.core.Observer}s only receive the respective terminal event.
  * 
    
  * Unlike a {@link BehaviorSubject}, a {@code PublishSubject} doesn't retain/cache items, therefore, a new
  * {@code Observer} won't receive any past items.
@@ -61,14 +59,14 @@
  * {@link #getThrowable()} and {@link #hasObservers()}.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code PublishSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code PublishSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Observer}s get notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code PublishSubject} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the last set of {@code Observer}s. During this emission,
  *  if one or more {@code Observer}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
  *  cancel at once).
  *  If there were no {@code Observer}s subscribed to this {@code PublishSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
similarity index 98%
rename from src/main/java/io/reactivex/subjects/ReplaySubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index 622854b5ec..477af44513 100644
--- a/src/main/java/io/reactivex/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import java.lang.reflect.Array;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.util.NotificationLite;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.util.NotificationLite;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Replays events (in a configurable bounded or unbounded manner) to current and late {@link Observer}s.
@@ -66,10 +66,10 @@
  * parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code ReplaySubject} is an {@link io.reactivex.Observable}, it does not support backpressure.
+ * Since a {@code ReplaySubject} is an {@link io.reactivex.rxjava3.core.Observable}, it does not support backpressure.
  * 
    
  * When this {@code ReplaySubject} is terminated via {@link #onError(Throwable)} or {@link #onComplete()},
- * late {@link io.reactivex.Observer}s will receive the retained/cached items first (if any) followed by the respective
+ * late {@link io.reactivex.rxjava3.core.Observer}s will receive the retained/cached items first (if any) followed by the respective
  * terminal event. If the {@code ReplaySubject} has a time-bound, the age of the retained/cached items are still considered
  * when replaying and thus it may result in no items being emitted before the terminal event.
  * 
    
@@ -98,7 +98,7 @@
  * such inaccessible items to be cleaned up by GC once no consumer references it anymore.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code ReplaySubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code ReplaySubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Observer}s get notified on the thread the respective {@code onXXX} methods were invoked.
  *  Time-bound {@code ReplaySubject}s use the given {@code Scheduler} in their {@code create} methods
  *  as time source to timestamp of items received for the age checks.
    
@@ -107,7 +107,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code Observer}s. During this emission,
  *  if one or more {@code Observer}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code Observer}s
  *  cancel at once).
  *  If there were no {@code Observer}s subscribed to this {@code ReplaySubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/SerializedSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
similarity index 93%
rename from src/main/java/io/reactivex/subjects/SerializedSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
index ec4263b85e..d70cf2f15c 100644
--- a/src/main/java/io/reactivex/subjects/SerializedSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
-import io.reactivex.Observer;
-import io.reactivex.annotations.Nullable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.util.*;
-import io.reactivex.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Serializes calls to the Observer methods.
diff --git a/src/main/java/io/reactivex/subjects/SingleSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
similarity index 93%
rename from src/main/java/io/reactivex/subjects/SingleSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
index cd9e3a2cd4..85be8f952d 100644
--- a/src/main/java/io/reactivex/subjects/SingleSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Represents a hot Single-like source and consumer of events similar to Subjects.
@@ -34,12 +34,12 @@
  * as parameters to  {@link #onSuccess(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code SingleSubject} is a {@link io.reactivex.Single}, calling {@code onSuccess} or {@code onError}
+ * Since a {@code SingleSubject} is a {@link io.reactivex.rxjava3.core.Single}, calling {@code onSuccess} or {@code onError}
  * will move this {@code SingleSubject} into its terminal state atomically.
  * 
    
  * All methods are thread safe. Calling {@link #onSuccess(Object)} multiple
  * times has no effect. Calling {@link #onError(Throwable)} multiple times relays the {@code Throwable} to
- * the {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
+ * the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} global error handler.
  * 
    
  * Even though {@code SingleSubject} implements the {@code SingleObserver} interface, calling
  * {@code onSubscribe} is not required (Rule 2.12)
@@ -54,7 +54,7 @@
  * The {@code SingleSubject} does not support clearing its cached {@code onSuccess} value.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code SingleSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code SingleSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code SingleObserver}s get notified on the thread where the terminating {@code onSuccess} or {@code onError}
  *  methods were invoked.
    
  *  
    Error handling:
    
@@ -62,7 +62,7 @@
  *  and emits the same {@code Throwable} instance to the last set of {@code SingleObserver}s. During this emission,
  *  if one or more {@code SingleObserver}s dispose their respective {@code Disposable}s, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code SingleObserver}s
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} (multiple times if multiple {@code SingleObserver}s
  *  cancel at once).
  *  If there were no {@code SingleObserver}s subscribed to this {@code SingleSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
diff --git a/src/main/java/io/reactivex/subjects/Subject.java b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
similarity index 91%
rename from src/main/java/io/reactivex/subjects/Subject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/Subject.java
index 4a57a4a77d..6a3b6462be 100644
--- a/src/main/java/io/reactivex/subjects/Subject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
 
 /**
  * Represents an {@link Observer} and an {@link Observable} at the same time, allowing
  * multicasting events from a single source to multiple child {@code Observer}s.
  * 
    
- * All methods except the {@link #onSubscribe(io.reactivex.disposables.Disposable)}, {@link #onNext(Object)},
+ * All methods except the {@link #onSubscribe(io.reactivex.rxjava3.disposables.Disposable)}, {@link #onNext(Object)},
  * {@link #onError(Throwable)} and {@link #onComplete()} are thread-safe.
  * Use {@link #toSerialized()} to make these methods thread-safe as well.
  *
diff --git a/src/main/java/io/reactivex/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
similarity index 96%
rename from src/main/java/io/reactivex/subjects/UnicastSubject.java
rename to src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index 8c3eae8af0..767e3eb332 100644
--- a/src/main/java/io/reactivex/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -11,22 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
-
-import io.reactivex.annotations.Nullable;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.plugins.RxJavaPlugins;
+package io.reactivex.rxjava3.subjects;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.CheckReturnValue;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.fuseable.SimpleQueue;
-import io.reactivex.internal.observers.BasicIntQueueDisposable;
-import io.reactivex.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
+import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
+import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A Subject that queues up events until a single {@link Observer} subscribes to it, replays
@@ -65,7 +62,7 @@
  * parameters to {@link #onNext(Object)} and {@link #onError(Throwable)}. Such calls will result in a
  * {@link NullPointerException} being thrown and the subject's state is not changed.
  * 
    
- * Since a {@code UnicastSubject} is an {@link io.reactivex.Observable}, it does not support backpressure.
+ * Since a {@code UnicastSubject} is an {@link io.reactivex.rxjava3.core.Observable}, it does not support backpressure.
  * 
    
  * When this {@code UnicastSubject} is terminated via {@link #onError(Throwable)} the current or late single {@code Observer}
  * may receive the {@code Throwable} before any available items could be emitted. To make sure an onError event is delivered
@@ -88,14 +85,14 @@
  * {@link #getThrowable()} and {@link #hasObservers()}.
  * 
    
  *  
    Scheduler:
    
- *  
    {@code UnicastSubject} does not operate by default on a particular {@link io.reactivex.Scheduler} and
+ *  
    {@code UnicastSubject} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the single {@code Observer} gets notified on the thread the respective {@code onXXX} methods were invoked.
    
  *  
    Error handling:
    
  *  
    When the {@link #onError(Throwable)} is called, the {@code UnicastSubject} enters into a terminal state
  *  and emits the same {@code Throwable} instance to the current single {@code Observer}. During this emission,
  *  if the single {@code Observer}s disposes its respective {@code Disposable}, the
  *  {@code Throwable} is delivered to the global error handler via
- *  {@link io.reactivex.plugins.RxJavaPlugins#onError(Throwable)}.
+ *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)}.
  *  If there were no {@code Observer}s subscribed to this {@code UnicastSubject} when the {@code onError()}
  *  was called, the global error handler is not invoked.
  *  
    
diff --git a/src/main/java/io/reactivex/subjects/package-info.java b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
similarity index 51%
rename from src/main/java/io/reactivex/subjects/package-info.java
rename to src/main/java/io/reactivex/rxjava3/subjects/package-info.java
index 091c223445..2980d499bb 100644
--- a/src/main/java/io/reactivex/subjects/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
@@ -24,35 +24,35 @@
  * 
  * 
  * 
- *     
- *     
- *     
+ *     
+ *     
  * 
  * 
- *     
- *     
- *     
+ *     
+ *     
+ *     
  * 
  * 
- *     
- *     
- *     
+ *     
+ *     
+ *     
  * 
  * 
- *     
- *     
- *     
+ *     
+ *     
+ *     
  * 
  * 
    Subject typeBase classConsumer interface
    {@link io.reactivex.subjects.Subject Subject}
- *     
       {@link io.reactivex.subjects.AsyncSubject AsyncSubject}
- *     
       {@link io.reactivex.subjects.BehaviorSubject BehaviorSubject}
- *     
       {@link io.reactivex.subjects.PublishSubject PublishSubject}
- *     
       {@link io.reactivex.subjects.ReplaySubject ReplaySubject}
- *     
       {@link io.reactivex.subjects.UnicastSubject UnicastSubject}
+ *         		{@link io.reactivex.rxjava3.subjects.Subject Subject}
+ *     
       {@link io.reactivex.rxjava3.subjects.AsyncSubject AsyncSubject}
+ *     
       {@link io.reactivex.rxjava3.subjects.BehaviorSubject BehaviorSubject}
+ *     
       {@link io.reactivex.rxjava3.subjects.PublishSubject PublishSubject}
+ *     
       {@link io.reactivex.rxjava3.subjects.ReplaySubject ReplaySubject}
+ *     
       {@link io.reactivex.rxjava3.subjects.UnicastSubject UnicastSubject}
  *         		{@link io.reactivex.Observable Observable}{@link io.reactivex.Observer Observer}{@link io.reactivex.rxjava3.core.Observable Observable}{@link io.reactivex.rxjava3.core.Observer Observer}
    {@link io.reactivex.subjects.SingleSubject SingleSubject}{@link io.reactivex.Single Single}{@link io.reactivex.SingleObserver SingleObserver}{@link io.reactivex.rxjava3.subjects.SingleSubject SingleSubject}{@link io.reactivex.rxjava3.core.Single Single}{@link io.reactivex.rxjava3.core.SingleObserver SingleObserver}
    {@link io.reactivex.subjects.MaybeSubject MaybeSubject}{@link io.reactivex.Maybe Maybe}{@link io.reactivex.MaybeObserver MaybeObserver}{@link io.reactivex.rxjava3.subjects.MaybeSubject MaybeSubject}{@link io.reactivex.rxjava3.core.Maybe Maybe}{@link io.reactivex.rxjava3.core.MaybeObserver MaybeObserver}
    {@link io.reactivex.subjects.CompletableSubject CompletableSubject}{@link io.reactivex.Completable Completable}{@link io.reactivex.CompletableObserver CompletableObserver}{@link io.reactivex.rxjava3.subjects.CompletableSubject CompletableSubject}{@link io.reactivex.rxjava3.core.Completable Completable}{@link io.reactivex.rxjava3.core.CompletableObserver CompletableObserver}
    
  * 
    
  * The backpressure-aware variants of the {@code Subject} class are called
  * {@link org.reactivestreams.Processor}s and reside in the {@code io.reactivex.processors} package.
- * @see io.reactivex.processors
+ * @see io.reactivex.rxjava3.processors
  */
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
diff --git a/src/main/java/io/reactivex/subscribers/DefaultSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
similarity index 93%
rename from src/main/java/io/reactivex/subscribers/DefaultSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
index 3038a955fd..3e674a16b0 100644
--- a/src/main/java/io/reactivex/subscribers/DefaultSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import org.reactivestreams.Subscription;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * Abstract base implementation of a {@link org.reactivestreams.Subscriber Subscriber} with
@@ -45,7 +45,7 @@
  *
  * 
    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)}
  * and {@link #onComplete()} are not allowed to throw any unchecked exceptions.
- * If for some reason this can't be avoided, use {@link io.reactivex.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
+ * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
  * instead of the standard {@code subscribe()} method.
  * @param  the value type
  *
diff --git a/src/main/java/io/reactivex/subscribers/DisposableSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
similarity index 92%
rename from src/main/java/io/reactivex/subscribers/DisposableSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
index 076dc9427f..2c6c126f8d 100644
--- a/src/main/java/io/reactivex/subscribers/DisposableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.reactivestreams.Subscription;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract Subscriber that allows asynchronous, external cancellation by implementing Disposable.
@@ -44,7 +44,7 @@
  *
  * 
    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)}
  * and {@link #onComplete()} are not allowed to throw any unchecked exceptions.
- * If for some reason this can't be avoided, use {@link io.reactivex.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
+ * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
  * instead of the standard {@code subscribe()} method.
  *
  * 
    Example
    
diff --git a/src/main/java/io/reactivex/subscribers/ResourceSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
similarity index 90%
rename from src/main/java/io/reactivex/subscribers/ResourceSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
index 220fafd191..71bdeb0121 100644
--- a/src/main/java/io/reactivex/subscribers/ResourceSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.ListCompositeDisposable;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.ListCompositeDisposable;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
  * An abstract Subscriber that allows asynchronous cancellation of its
@@ -33,10 +33,10 @@
  * 
    To release the associated resources, one has to call {@link #dispose()}
  * in {@code onError()} and {@code onComplete()} explicitly.
  *
- * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.disposables.Disposable Disposable}s)
+ * 
    Use {@link #add(Disposable)} to associate resources (as {@link io.reactivex.rxjava3.disposables.Disposable Disposable}s)
  * with this {@code ResourceSubscriber} that will be cleaned up when {@link #dispose()} is called.
  * Removing previously associated resources is not possible but one can create a
- * {@link io.reactivex.disposables.CompositeDisposable CompositeDisposable}, associate it with this
+ * {@link io.reactivex.rxjava3.disposables.CompositeDisposable CompositeDisposable}, associate it with this
  * {@code ResourceSubscriber} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
@@ -57,7 +57,7 @@
  *
  * 
    Implementation of {@link #onStart()}, {@link #onNext(Object)}, {@link #onError(Throwable)}
  * and {@link #onComplete()} are not allowed to throw any unchecked exceptions.
- * If for some reason this can't be avoided, use {@link io.reactivex.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
+ * If for some reason this can't be avoided, use {@link io.reactivex.rxjava3.core.Flowable#safeSubscribe(org.reactivestreams.Subscriber)}
  * instead of the standard {@code subscribe()} method.
  *
  * 
    Example
    
diff --git a/src/main/java/io/reactivex/subscribers/SafeSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
similarity index 96%
rename from src/main/java/io/reactivex/subscribers/SafeSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
index e903a5519c..9311099e63 100644
--- a/src/main/java/io/reactivex/subscribers/SafeSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Wraps another Subscriber and ensures all onXXX methods conform the protocol
diff --git a/src/main/java/io/reactivex/subscribers/SerializedSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
similarity index 95%
rename from src/main/java/io/reactivex/subscribers/SerializedSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
index 4e1b147d8e..85386c1954 100644
--- a/src/main/java/io/reactivex/subscribers/SerializedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Serializes access to the onNext, onError and onComplete methods of another Subscriber.
diff --git a/src/main/java/io/reactivex/subscribers/TestSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
similarity index 97%
rename from src/main/java/io/reactivex/subscribers/TestSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
index cf251d3eca..3607337b36 100644
--- a/src/main/java/io/reactivex/subscribers/TestSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
@@ -10,15 +10,15 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.observers.BaseTestConsumer;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.observers.BaseTestConsumer;
 
 /**
  * A subscriber that records events and allows making assertions about them.
diff --git a/src/main/java/io/reactivex/subscribers/package-info.java b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
similarity index 80%
rename from src/main/java/io/reactivex/subscribers/package-info.java
rename to src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
index 409efd6e79..1792e0e460 100644
--- a/src/main/java/io/reactivex/subscribers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
@@ -17,7 +17,7 @@
 /**
  * Default wrappers and implementations for Subscriber-based consumer classes and interfaces,
  * including disposable and resource-tracking variants and
- * the {@link io.reactivex.subscribers.TestSubscriber} that allows unit testing
- * {@link io.reactivex.Flowable}-based flows.
+ * the {@link io.reactivex.rxjava3.subscribers.TestSubscriber} that allows unit testing
+ * {@link io.reactivex.rxjava3.core.Flowable}-based flows.
  */
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
diff --git a/src/test/java/io/reactivex/completable/CapturingUncaughtExceptionHandler.java b/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
similarity index 96%
rename from src/test/java/io/reactivex/completable/CapturingUncaughtExceptionHandler.java
rename to src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
index ebc3e51b97..66738a5513 100644
--- a/src/test/java/io/reactivex/completable/CapturingUncaughtExceptionHandler.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.reactivex.completable;
+package io.reactivex.rxjava3.completable;
 
 import java.util.concurrent.CountDownLatch;
 
diff --git a/src/test/java/io/reactivex/completable/CompletableRetryTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
similarity index 94%
rename from src/test/java/io/reactivex/completable/CompletableRetryTest.java
rename to src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
index b450e3229f..909ce35669 100644
--- a/src/test/java/io/reactivex/completable/CompletableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.completable;
+package io.reactivex.rxjava3.completable;
+
+import static org.junit.Assert.assertEquals;
 
-import io.reactivex.Completable;
-import io.reactivex.RxJavaTest;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class CompletableRetryTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
similarity index 99%
rename from src/test/java/io/reactivex/completable/CompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
index d4549b8291..ebe1303bd2 100644
--- a/src/test/java/io/reactivex/completable/CompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.completable;
+package io.reactivex.rxjava3.completable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,23 +24,23 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 /**
  * Test Completable methods and operators.
diff --git a/src/test/java/io/reactivex/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
similarity index 88%
rename from src/test/java/io/reactivex/completable/CompletableTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
index fa690a327e..17f1e7beae 100644
--- a/src/test/java/io/reactivex/completable/CompletableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.completable;
+package io.reactivex.rxjava3.completable;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.Completable;
-import io.reactivex.functions.Action;
-import io.reactivex.schedulers.TestScheduler;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
 
 public class CompletableTimerTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/BackpressureEnumTest.java b/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
similarity index 93%
rename from src/test/java/io/reactivex/BackpressureEnumTest.java
rename to src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
index ca8c58475e..583899167d 100644
--- a/src/test/java/io/reactivex/BackpressureEnumTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex;
+package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.annotations.BackpressureKind;
+import io.reactivex.rxjava3.annotations.BackpressureKind;
 
 public class BackpressureEnumTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/ConverterTest.java b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
similarity index 98%
rename from src/test/java/io/reactivex/ConverterTest.java
rename to src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
index d2a77cc36c..7a39c85cfd 100644
--- a/src/test/java/io/reactivex/ConverterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex;
+package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.parallel.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.parallel.*;
 
 public final class ConverterTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/NotificationTest.java b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
similarity index 90%
rename from src/test/java/io/reactivex/NotificationTest.java
rename to src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
index 3ee7d488b9..1c1a6adf59 100644
--- a/src/test/java/io/reactivex/NotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex;
+package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class NotificationTest extends RxJavaTest {
 
@@ -60,7 +60,7 @@ public void hashCodeIsTheInner() {
     @Test
     public void toStringPattern() {
         assertEquals("OnNextNotification[1]", Notification.createOnNext(1).toString());
-        assertEquals("OnErrorNotification[io.reactivex.exceptions.TestException]", Notification.createOnError(new TestException()).toString());
+        assertEquals("OnErrorNotification[io.reactivex.rxjava3.exceptions.TestException]", Notification.createOnError(new TestException()).toString());
         assertEquals("OnCompleteNotification", Notification.createOnComplete().toString());
     }
 }
diff --git a/src/test/java/io/reactivex/Retry.java b/src/test/java/io/reactivex/rxjava3/core/Retry.java
similarity index 98%
rename from src/test/java/io/reactivex/Retry.java
rename to src/test/java/io/reactivex/rxjava3/core/Retry.java
index e1b2f4b064..a738e0e3c7 100644
--- a/src/test/java/io/reactivex/Retry.java
+++ b/src/test/java/io/reactivex/rxjava3/core/Retry.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex;
+package io.reactivex.rxjava3.core;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
diff --git a/src/test/java/io/reactivex/RxJavaTest.java b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
similarity index 91%
rename from src/test/java/io/reactivex/RxJavaTest.java
rename to src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
index b0e2fc2367..d903a87f0c 100644
--- a/src/test/java/io/reactivex/RxJavaTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+package io.reactivex.rxjava3.core;
 
 import java.util.concurrent.TimeUnit;
 
+import org.junit.*;
+import org.junit.rules.Timeout;
+
 public abstract class RxJavaTest {
     @Rule
     public Timeout globalTimeout = new Timeout(5, TimeUnit.MINUTES);
diff --git a/src/test/java/io/reactivex/TransformerTest.java b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
similarity index 98%
rename from src/test/java/io/reactivex/TransformerTest.java
rename to src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
index 0c388be535..8f9f102a04 100644
--- a/src/test/java/io/reactivex/TransformerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex;
+package io.reactivex.rxjava3.core;
+
+import static org.junit.Assert.*;
 
-import io.reactivex.exceptions.TestException;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class TransformerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/XFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
similarity index 97%
rename from src/test/java/io/reactivex/XFlatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
index 811e4590ad..7efeee401d 100644
--- a/src/test/java/io/reactivex/XFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex;
+package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -21,13 +21,13 @@
 import org.junit.*;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class XFlatMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
similarity index 98%
rename from src/test/java/io/reactivex/disposables/CompositeDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
index fde6cab472..2d6fec394b 100644
--- a/src/test/java/io/reactivex/disposables/CompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.disposables;
+package io.reactivex.rxjava3.disposables;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.CompositeException;
-import io.reactivex.functions.Action;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompositeDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/disposables/DisposablesTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
similarity index 93%
rename from src/test/java/io/reactivex/disposables/DisposablesTest.java
rename to src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
index 670013f37c..d5ea5d0d49 100644
--- a/src/test/java/io/reactivex/disposables/DisposablesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
@@ -11,23 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.disposables;
+package io.reactivex.rxjava3.disposables;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.functions.Action;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposablesTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/disposables/FutureDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/disposables/FutureDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
index b42d808c4f..7cb13de5a8 100644
--- a/src/test/java/io/reactivex/disposables/FutureDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.disposables;
-
-import java.util.concurrent.FutureTask;
+package io.reactivex.rxjava3.disposables;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
+import java.util.concurrent.FutureTask;
+
 import org.junit.Test;
 
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class FutureDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/disposables/SequentialDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
index 07a25908db..5f6813d528 100644
--- a/src/test/java/io/reactivex/disposables/SequentialDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.disposables;
+package io.reactivex.rxjava3.disposables;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,12 +19,12 @@
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import io.reactivex.internal.disposables.SequentialDisposable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SequentialDisposableTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
similarity index 97%
rename from src/test/java/io/reactivex/disposables/SerialDisposableTests.java
rename to src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
index e10f41d671..442c2e8385 100644
--- a/src/test/java/io/reactivex/disposables/SerialDisposableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.disposables;
+package io.reactivex.rxjava3.disposables;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,12 +19,12 @@
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import io.reactivex.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SerialDisposableTests extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/exceptions/CompositeExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
similarity index 98%
rename from src/test/java/io/reactivex/exceptions/CompositeExceptionTest.java
rename to src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
index b3b9518830..51cb83523e 100644
--- a/src/test/java/io/reactivex/exceptions/CompositeExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.exceptions;
+package io.reactivex.rxjava3.exceptions;
 
 import static org.junit.Assert.*;
 
 import java.io.*;
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.CompositeException.CompositeExceptionCausalChain;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.CompositeException.CompositeExceptionCausalChain;
 
 public class CompositeExceptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/exceptions/ExceptionsTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
similarity index 93%
rename from src/test/java/io/reactivex/exceptions/ExceptionsTest.java
rename to src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
index 9d2e9ba4e9..3d2e1eeec4 100644
--- a/src/test/java/io/reactivex/exceptions/ExceptionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.exceptions;
+package io.reactivex.rxjava3.exceptions;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ExceptionsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/exceptions/OnErrorNotImplementedExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
similarity index 93%
rename from src/test/java/io/reactivex/exceptions/OnErrorNotImplementedExceptionTest.java
rename to src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
index 5f20033d8a..b8a78de7dc 100644
--- a/src/test/java/io/reactivex/exceptions/OnErrorNotImplementedExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.exceptions;
+package io.reactivex.rxjava3.exceptions;
 
 import static org.junit.Assert.*;
 
@@ -19,10 +19,10 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class OnErrorNotImplementedExceptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/exceptions/TestException.java b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
similarity index 97%
rename from src/test/java/io/reactivex/exceptions/TestException.java
rename to src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
index eef7a47a85..8618c7df5e 100644
--- a/src/test/java/io/reactivex/exceptions/TestException.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.exceptions;
+package io.reactivex.rxjava3.exceptions;
 
 /**
  * Exception for testing if unchecked expections propagate as-is without confusing with
diff --git a/src/test/java/io/reactivex/flowable/Burst.java b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
similarity index 91%
rename from src/test/java/io/reactivex/flowable/Burst.java
rename to src/test/java/io/reactivex/rxjava3/flowable/Burst.java
index 47b8424e0c..8acf477242 100644
--- a/src/test/java/io/reactivex/flowable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
@@ -10,20 +10,17 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
+import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 
 /**
  * Creates {@link Flowable} of a number of items followed by either an error or
diff --git a/src/test/java/io/reactivex/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
similarity index 98%
rename from src/test/java/io/reactivex/flowable/FlowableBackpressureTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
index 79cda60472..21f171cefb 100644
--- a/src/test/java/io/reactivex/flowable/FlowableBackpressureTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
@@ -19,18 +19,17 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.junit.rules.TestName;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.internal.util.BackpressureHelper;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
 
 public class FlowableBackpressureTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableCollectTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
similarity index 97%
rename from src/test/java/io/reactivex/flowable/FlowableCollectTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
index 5ee7623f31..f0f93c6453 100644
--- a/src/test/java/io/reactivex/flowable/FlowableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
-import static io.reactivex.internal.util.TestingHelper.*;
+import static io.reactivex.rxjava3.internal.util.TestingHelper.*;
 import static org.junit.Assert.*;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public final class FlowableCollectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
similarity index 91%
rename from src/test/java/io/reactivex/flowable/FlowableCombineLatestTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
index 787a370dc7..3adac790ae 100644
--- a/src/test/java/io/reactivex/flowable/FlowableCombineLatestTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.flowable.FlowableCovarianceTest.*;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableCovarianceTest.*;
+import io.reactivex.rxjava3.functions.*;
 
 public class FlowableCombineLatestTests extends RxJavaTest {
     /**
diff --git a/src/test/java/io/reactivex/flowable/FlowableConcatTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
similarity index 97%
rename from src/test/java/io/reactivex/flowable/FlowableConcatTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
index 09837bb7d6..e800a9173c 100644
--- a/src/test/java/io/reactivex/flowable/FlowableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
@@ -10,18 +10,17 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.flowable.FlowableCovarianceTest.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableCovarianceTest.*;
 
 public class FlowableConcatTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableConversionTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
similarity index 96%
rename from src/test/java/io/reactivex/flowable/FlowableConversionTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
index 9b8037363a..23b484e369 100644
--- a/src/test/java/io/reactivex/flowable/FlowableConversionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -20,13 +20,13 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.operators.flowable.*;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.operators.flowable.*;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
 
 public class FlowableConversionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
similarity index 97%
rename from src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
index e5f2a8238e..a14462e905 100644
--- a/src/test/java/io/reactivex/flowable/FlowableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,10 +23,10 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.flowables.GroupedFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowables.GroupedFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 /**
  * Test super/extends of generics.
diff --git a/src/test/java/io/reactivex/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
similarity index 91%
rename from src/test/java/io/reactivex/flowable/FlowableDoAfterNextTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
index fbfea38ec8..58f21b10d3 100644
--- a/src/test/java/io/reactivex/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.Consumer;
 
 public class FlowableDoAfterNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
similarity index 94%
rename from src/test/java/io/reactivex/flowable/FlowableDoOnTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
index b0e8ebb96b..2655f8c4fd 100644
--- a/src/test/java/io/reactivex/flowable/FlowableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
@@ -19,9 +19,9 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
 
 public class FlowableDoOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
similarity index 94%
rename from src/test/java/io/reactivex/flowable/FlowableErrorHandlingTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
index 5ee59507db..694dedded4 100644
--- a/src/test/java/io/reactivex/flowable/FlowableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertNotNull;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
 
 public class FlowableErrorHandlingTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableEventStream.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
similarity index 94%
rename from src/test/java/io/reactivex/flowable/FlowableEventStream.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
index b158d39e8f..7c64da9ada 100644
--- a/src/test/java/io/reactivex/flowable/FlowableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import java.util.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Utility for retrieving a mock eventstream for testing.
diff --git a/src/test/java/io/reactivex/flowable/FlowableEventStreamTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
similarity index 85%
rename from src/test/java/io/reactivex/flowable/FlowableEventStreamTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
index e37758afb5..8965376b8a 100644
--- a/src/test/java/io/reactivex/flowable/FlowableEventStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableEventStreamTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/flowable/FlowableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/flowable/FlowableFuseableTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
index f1d8387533..02fa0e5be7 100644
--- a/src/test/java/io/reactivex/flowable/FlowableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
@@ -10,16 +10,15 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import java.util.Arrays;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFuseableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableGroupByTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
similarity index 92%
rename from src/test/java/io/reactivex/flowable/FlowableGroupByTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
index 3c37984925..287668475e 100644
--- a/src/test/java/io/reactivex/flowable/FlowableGroupByTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
@@ -11,17 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.flowable.FlowableEventStream.Event;
-import io.reactivex.flowables.GroupedFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableEventStream.Event;
+import io.reactivex.rxjava3.flowables.GroupedFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class FlowableGroupByTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableMergeTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
similarity index 94%
rename from src/test/java/io/reactivex/flowable/FlowableMergeTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
index 8881497af3..e200cd0f12 100644
--- a/src/test/java/io/reactivex/flowable/FlowableMergeTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.flowable.FlowableCovarianceTest.*;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableCovarianceTest.*;
+import io.reactivex.rxjava3.functions.Supplier;
 
 public class FlowableMergeTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableNotificationTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
similarity index 97%
rename from src/test/java/io/reactivex/flowable/FlowableNotificationTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
index 321423a902..2e2b95bbd8 100644
--- a/src/test/java/io/reactivex/flowable/FlowableNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
@@ -11,11 +11,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import org.junit.*;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 public class FlowableNotificationTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
similarity index 99%
rename from src/test/java/io/reactivex/flowable/FlowableNullTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index 7786b4827e..1e279f64c1 100644
--- a/src/test/java/io/reactivex/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,14 +22,14 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Verifies the operators handle null values properly by emitting/throwing NullPointerExceptions.
diff --git a/src/test/java/io/reactivex/flowable/FlowableReduceTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
similarity index 96%
rename from src/test/java/io/reactivex/flowable/FlowableReduceTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
index 8832388db3..1e6abe83c9 100644
--- a/src/test/java/io/reactivex/flowable/FlowableReduceTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.flowable.FlowableCovarianceTest.*;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableCovarianceTest.*;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 public class FlowableReduceTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
similarity index 95%
rename from src/test/java/io/reactivex/flowable/FlowableStartWithTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
index 47896bdd0e..e4ea973b5b 100644
--- a/src/test/java/io/reactivex/flowable/FlowableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
@@ -11,16 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.*;
 
 public class FlowableStartWithTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
similarity index 97%
rename from src/test/java/io/reactivex/flowable/FlowableSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
index dc4a5e1100..ed3f8f4cdc 100644
--- a/src/test/java/io/reactivex/flowable/FlowableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
@@ -11,27 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscribers.ForEachWhileSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscribers.ForEachWhileSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSubscriberTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
similarity index 98%
rename from src/test/java/io/reactivex/flowable/FlowableTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
index 958ab594d8..e61e106f1a 100644
--- a/src/test/java/io/reactivex/flowable/FlowableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,19 +25,19 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
similarity index 89%
rename from src/test/java/io/reactivex/flowable/FlowableThrottleLastTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
index d1e41ed925..c6db747cf1 100644
--- a/src/test/java/io/reactivex/flowable/FlowableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.mockito.Mockito.inOrder;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableThrottleLastTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
similarity index 90%
rename from src/test/java/io/reactivex/flowable/FlowableThrottleWithTimeoutTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
index 01a1e349b3..f84d27a00d 100644
--- a/src/test/java/io/reactivex/flowable/FlowableThrottleWithTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.mockito.Mockito.inOrder;
 
@@ -21,10 +21,10 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableThrottleWithTimeoutTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableWindowTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
similarity index 92%
rename from src/test/java/io/reactivex/flowable/FlowableWindowTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
index ae0865a576..bcf3638316 100644
--- a/src/test/java/io/reactivex/flowable/FlowableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
@@ -11,17 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
 
 public class FlowableWindowTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/flowable/FlowableZipTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
similarity index 95%
rename from src/test/java/io/reactivex/flowable/FlowableZipTests.java
rename to src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
index d57af07681..e022e02c82 100644
--- a/src/test/java/io/reactivex/flowable/FlowableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.flowable;
+package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.flowable.FlowableCovarianceTest.*;
-import io.reactivex.flowable.FlowableEventStream.Event;
-import io.reactivex.flowables.GroupedFlowable;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowable.FlowableCovarianceTest.*;
+import io.reactivex.rxjava3.flowable.FlowableEventStream.Event;
+import io.reactivex.rxjava3.flowables.GroupedFlowable;
+import io.reactivex.rxjava3.functions.*;
 
 public class FlowableZipTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/SubscribeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/SubscribeWithTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
index 6d53bc2dfa..15a7c1190d 100644
--- a/src/test/java/io/reactivex/internal/SubscribeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal;
+package io.reactivex.rxjava3.internal;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class SubscribeWithTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
index dec35cd142..c5edd75477 100644
--- a/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.disposables;
+package io.reactivex.rxjava3.internal.disposables;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ArrayCompositeDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
index b1ee91966d..03f54c9218 100644
--- a/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.disposables;
+package io.reactivex.rxjava3.internal.disposables;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CancellableDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
index 948eaa8440..ea0c4ea89b 100644
--- a/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.disposables;
+package io.reactivex.rxjava3.internal.disposables;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableHelperTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
index 7c50e030aa..b66f27036e 100644
--- a/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.disposables;
+package io.reactivex.rxjava3.internal.disposables;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class EmptyDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
index 849d0874f1..280cb1c28e 100644
--- a/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.disposables;
+package io.reactivex.rxjava3.internal.disposables;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ListCompositeDisposableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/functions/FunctionsTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
index 9c278666c7..98488bcd49 100644
--- a/src/test/java/io/reactivex/internal/functions/FunctionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.functions;
+package io.reactivex.rxjava3.internal.functions;
 
 import static org.junit.Assert.*;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions.*;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions.*;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FunctionsTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
index 89ef9f27c0..c4ae28f883 100644
--- a/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.functions;
+package io.reactivex.rxjava3.internal.functions;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import io.reactivex.testsupport.TestHelper;
+import org.junit.Test;
 
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObjectHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
index 8b02f4d15e..c62f59f831 100644
--- a/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.annotations.Nullable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestObserverEx;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
 public class BasicFuseableObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
index 1b56ee3d31..e5ed0fb605 100644
--- a/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
@@ -11,12 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.annotations.Nullable;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class BasicQueueDisposableTest extends RxJavaTest {
 
     BasicQueueDisposable q = new BasicQueueDisposable() {
diff --git a/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
index 5cc644ba55..e871ec9639 100644
--- a/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class BlockingFirstObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
index 438bcb0d6d..dddbb1e962 100644
--- a/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class BlockingMultiObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
index fba743e053..f5d8fb6117 100644
--- a/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class BlockingObserverTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
index f5a2228607..e52ab8c023 100644
--- a/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.internal.functions.Functions;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public final class CallbackCompletableObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
index 5a8f82093d..aa2e6e22e3 100644
--- a/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.internal.functions.Functions;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public final class ConsumerSingleObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
index 6bdacd6334..139d6fa0fc 100644
--- a/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
@@ -11,22 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class DeferredScalarObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
index 35ac2f72b7..0de5f0dcaa 100644
--- a/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableLambdaObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
index 7e91d16f7a..e873326375 100644
--- a/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
@@ -11,12 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.assertFalse;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
+import io.reactivex.rxjava3.core.RxJavaTest;
 
 public final class EmptyCompletableObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/observers/FutureObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
index fb1939ddd1..1edecae92c 100644
--- a/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscribers.FutureSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscribers.FutureSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FutureObserverTest extends RxJavaTest {
     FutureObserver fo;
diff --git a/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
index be8d16f1e3..eb11be24c3 100644
--- a/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FutureSingleObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
index 7e0bbe4c35..7cfd46352a 100644
--- a/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.internal.functions.Functions;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class LambdaObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
index a93c535430..b8d82a3ed3 100644
--- a/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.observers;
+package io.reactivex.rxjava3.internal.observers;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.queue.SpscArrayQueue;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class QueueDrainObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
index 333b9e26c0..02e607e6c8 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -21,18 +21,18 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.completable.CompletableAmb.Amb;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableAmb.Amb;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAmbTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
index c0179595b0..1137804fe2 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.*;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
-
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenCompletableabTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
index 16120790f3..41656dbf33 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
index 2fe472dce0..b7d6d61ea3 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.processors.PublishProcessor;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.processors.PublishProcessor;
 
 public class CompletableAwaitTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
index f8d969a40c..08c93ae7d6 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableCacheTest extends RxJavaTest implements Consumer, Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index a336aeec51..19cff53d90 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -21,16 +21,16 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableConcatTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
index 38eaebdd1b..8b7993609f 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableCreateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
index 210b83b43d..d467d8e2cf 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
@@ -11,22 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Completable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.CompletableSubject;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 
 public class CompletableDelaySubscriptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
index 5309af1fcb..117bdb0bcf 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertNotEquals;
 
@@ -20,13 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableDelayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
index 2a2c6646b6..5225359554 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertNull;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableDetachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
index ebe5b708e9..32b5a85aa9 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableDisposeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
index e362b1d812..cd0df19aaf 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,12 +19,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableDoFinallyTest extends RxJavaTest implements Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
index 59b8582a4a..fea4bcb84e 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableDoOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
index 269ead502e..fb45fc3bad 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
@@ -11,18 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Completable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
 
 public class CompletableFromActionTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
index 87072652d1..da082c514d 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.*;
@@ -23,12 +24,12 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromCallableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
index 02d966af5a..9158d449c3 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
@@ -11,13 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.*;
+
 public class CompletableFromMaybeTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
     public void fromMaybeNull() {
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
index 255487c14d..9869ed04db 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
@@ -11,13 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.*;
+
 public class CompletableFromObservableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
     public void fromObservableNull() {
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
index 0fffa272a8..7cfd899262 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromPublisherTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
index dc930d74c7..276ae320b6 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
@@ -11,17 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Completable;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class CompletableFromRunnableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
index ba8a4fabb7..f9c6e82676 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
@@ -11,13 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
-import io.reactivex.Completable;
-import io.reactivex.RxJavaTest;
-import io.reactivex.Single;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.*;
+
 public class CompletableFromSingleTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
     public void fromSingleNull() {
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
index 119ad643f0..c7943de244 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.CountDownLatch;
@@ -23,13 +24,13 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromSupplierTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
index 943f6a2464..59352d76a5 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.TestHelper;
+import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableHideTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
index 5d1e434edd..4f0ba23ce8 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableLiftTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
index 06075c8809..23b4e25731 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableMaterializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
index 3476a76f72..67253bceb0 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableMergeIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
index 6639a92883..6a7c9aa70d 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableMergeTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
index de0ffd9a6b..6d5cc21064 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableObserveOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
index c740b0c2d8..4a1333b530 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
 
 public class CompletableOnErrorXTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
similarity index 77%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
index f3d146b856..ddc5a16056 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletablePeekTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
index 87c1465cfb..6a80eda644 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
@@ -11,14 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
 
 public class CompletableRepeatWhenTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
index 8c1b5173c7..5670264378 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableResumeNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
index f29df8b02c..22d826fc70 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableSubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
index 859dc7fc74..7c140db31d 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class CompletableSubscribeTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
index 1ac2f733f0..b8b48fe9c0 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableTakeUntilTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
index cf13103e45..9261562220 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
@@ -11,28 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Completable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.operators.completable.CompletableTimeout.TimeOutObserver;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableTimeout.TimeOutObserver;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableTimeoutTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
index 717f76d5e4..7f6b339961 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableTimerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
index 6b709751d2..d1fdb548fa 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableToFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
index 4e652a6d4c..d94a4ba097 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.operators.completable.CompletableToObservable.ObserverCompletableObserver;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableToObservable.ObserverCompletableObserver;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableToObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
index c08dd05c55..7cad5802b6 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -19,10 +19,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableUnsafeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
index 5056b7617a..ca4634c7f5 100644
--- a/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.completable;
+package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableUsingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
similarity index 81%
rename from src/test/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
index 9c6cd83f59..e109a0a544 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
@@ -11,16 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertSame;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamPublisher;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
 
 public class AbstractFlowableWithUpstreamTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
index ddb03e7de3..825c74e321 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -21,12 +21,12 @@
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingFlowableLatestTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecentTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
index 0bdf853813..f652e9fbf6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,10 +20,10 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.TestScheduler;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
 
 public class BlockingFlowableMostRecentTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
index 7769caa374..8bc31fa85e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,15 +22,15 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.SerialDisposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.operators.flowable.BlockingFlowableNext.NextSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.SerialDisposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.operators.flowable.BlockingFlowableNext.NextSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingFlowableNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToFutureTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
index 3ea818525f..cf8ad48a5f 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 
 public class BlockingFlowableToFutureTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToIteratorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
index a21963653c..abb445c149 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BlockingFlowableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.operators.flowable.BlockingFlowableIterable.BlockingFlowableIterator;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.operators.flowable.BlockingFlowableIterable.BlockingFlowableIterator;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 
 public class BlockingFlowableToIteratorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/BufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/BufferUntilSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
index bded90d2bc..69abd706eb 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/BufferUntilSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class BufferUntilSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableAllTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
index 40f4cd191d..7515b66cb0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
@@ -11,26 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableAllTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableAmbTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index 655953cb1b..149187b573 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -25,17 +25,17 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableAmbTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableAnyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
index 597eb600ef..936d74f5e0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
@@ -11,26 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableAnyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableAsObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
index 0d751342fc..15cd39ea0a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableAsObservableTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableAutoConnectTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
index f62d51fbb0..d2213dd911 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableAutoConnectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertTrue;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.processors.PublishProcessor;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.processors.PublishProcessor;
 
 public class FlowableAutoConnectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableBlockingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
index e37c828c54..cb767ef718 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,16 +22,16 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableBlockingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
similarity index 99%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
index 343b22af49..bcd53605fc 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -26,18 +26,18 @@
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableBufferTimed.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableBufferTimed.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableBufferTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
index 788e46428f..e13ef40f0c 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,18 +20,17 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableCacheTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableCastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
index d9ad6a530b..c39b1972f0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableCastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index f3d15d7d50..bbffd97ee4 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.*;
@@ -21,21 +22,21 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.operators.flowable.FlowableZipTest.ArgsToString;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableZipTest.ArgsToString;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableCombineLatestTest extends RxJavaTest {
 
@@ -1024,7 +1025,7 @@ public void combineLatestNArguments() throws Exception {
         for (int i = 2; i < 10; i++) {
             Class[] types = new Class[i + 1];
             Arrays.fill(types, Publisher.class);
-            types[i] = i == 2 ? BiFunction.class : Class.forName("io.reactivex.functions.Function" + i);
+            types[i] = i == 2 ? BiFunction.class : Class.forName("io.reactivex.rxjava3.functions.Function" + i);
 
             Method m = Flowable.class.getMethod("combineLatest", types);
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatDelayErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
index f9d904ddac..e5ce3766ea 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class FlowableConcatDelayErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 225cb2b627..5f41cce3dc 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,16 +22,16 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatMapEagerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index 4d7c735f1e..1493d7aec7 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,20 +20,20 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatMapSchedulerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
index 6b572066cc..0d70a2430e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,13 +21,13 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.operators.flowable.FlowableConcatMap.WeakScalarSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.WeakScalarSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableConcatMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 96c1f5d9f6..368f5cd043 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.Method;
@@ -21,21 +22,21 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
index a36ca14cd1..a89897090a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableConcatWithCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
index 26f500b4fb..ea9e8f2330 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class FlowableConcatWithMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
index 2e11f657e0..c846a2f5d5 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class FlowableConcatWithSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableCountTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
index 724b83ef68..158a3232f0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableCountTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index 0862ed3a20..023f5b5a25 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -21,13 +21,13 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableCreateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDebounceTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
index a6ec2766cf..17ae8ef654 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,18 +25,18 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableDebounceTimed.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableDebounceTimed.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDebounceTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
index 5289d0bad0..ff99ca80e1 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDefaultIfEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDeferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
index 58e45e5c04..90b4b86782 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 @SuppressWarnings("unchecked")
 public class FlowableDeferTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
index 2cda4c6bb8..9ac97e12ab 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
@@ -10,7 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -18,13 +18,13 @@
 import org.junit.*;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableDelaySubscriptionOtherTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDelayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
index c7efa6a243..c5167f4fcd 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,14 +25,14 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableDelayTest extends RxJavaTest {
     private Subscriber subscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDematerializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
index bab010876b..75a05cbd23 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -20,13 +21,13 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDematerializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDetachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
index da36b8f43c..c328565218 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicReference;
@@ -21,11 +21,11 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableDetachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
index 101a4ea8fa..1c21705a9f 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -22,15 +23,15 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDistinctTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
index 9f40c99ed6..9d9aa55fd8 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
@@ -11,29 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDistinctUntilChangedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
index 6c13186bbf..51b27abad1 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
@@ -11,23 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDoAfterNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterTerminateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
index 47481de5a8..210ed3879b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -24,12 +24,12 @@
 import org.mockito.Mockito;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableDoAfterTerminateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 3a53db54f7..7662162d22 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDoFinallyTest extends RxJavaTest implements Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnEachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
index fc46bdfe12..deea77ea70 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -23,17 +24,17 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableDoOnEachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
index 9456164388..524a0b5acb 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableDoOnLifecycleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnRequestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnRequestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
index c22f242da7..e4eb8543f6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnRequestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
 
 public class FlowableDoOnRequestTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnSubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
index 7fe88ad74d..f300d0427f 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 
 public class FlowableDoOnSubscribeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
index c3819118de..340b3f22d9 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,14 +19,13 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.*;
-import io.reactivex.processors.BehaviorProcessor;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.BehaviorProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class FlowableDoOnUnsubscribeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableElementAtTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
index 06530b329b..f4701665cb 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
@@ -11,26 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.LongConsumer;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableElementAtTest extends RxJavaTest {
 
@@ -70,7 +69,7 @@ public void elementAt() {
         assertEquals(2, Flowable.fromArray(1, 2).elementAt(1).blockingGet()
                 .intValue());
     }
-    
+
     @Test
     public void elementAtConstrainsUpstreamRequests() {
         final List requests = new ArrayList();
@@ -86,7 +85,7 @@ public void accept(long n) throws Throwable {
                 .intValue();
         assertEquals(Arrays.asList(3L), requests);
     }
-    
+
     @Test
     public void elementAtWithDefaultConstrainsUpstreamRequests() {
         final List requests = new ArrayList();
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFilterTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
index 845603ae80..38e94571c2 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
@@ -11,29 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFilterTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFirstTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
index 81e2e0e269..efcdb290c0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.util.NoSuchElementException;
+
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import java.util.NoSuchElementException;
-
-import io.reactivex.*;
-import io.reactivex.functions.Predicate;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFirstTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
index 06b1573e04..592756d85e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFlatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
index 9f8e62f280..332d906952 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
@@ -11,28 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
-import java.util.*;
+import java.util.List;
 import java.util.concurrent.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.Flowable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFlatMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
index 71df815a56..e207dc57a1 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
@@ -11,28 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
-import java.util.*;
+import java.util.List;
 import java.util.concurrent.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.Flowable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFlatMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index a4007a45a1..483d92062a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,15 +24,15 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFlatMapTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
index f1d3f0b068..e9e25c8af2 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,18 +22,18 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.operators.flowable.FlowableFlattenIterable.FlattenIterableSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlattenIterable.FlattenIterableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFlattenIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableForEachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
index db044cdd80..c643c0652b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
@@ -11,18 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
 
 public class FlowableForEachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromArrayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
index 740f2d8727..62607299d6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.ScalarSupplier;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFromArrayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromCallableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
index 0caaa8ad84..3897940fc4 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
@@ -14,9 +14,10 @@
  * the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -27,13 +28,13 @@
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFromCallableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index 4f93196ea2..1b21baf610 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,16 +25,16 @@
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFromIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
index f80fb55a32..5689eadf49 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFromObservableTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
index b69597bc92..76fff6cb82 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSourceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.List;
 
 import org.junit.*;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableFromSourceTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSupplierTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
index 3b9b8d5c30..5aa34993da 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
@@ -14,27 +14,27 @@
  * the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFromSupplierTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableGenerateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
index e2596dc37f..ecd965a4f8 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableGenerateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
similarity index 99%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupByTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 9d18baf941..8bcc07c7de 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -28,18 +29,18 @@
 import com.google.common.base.Ticker;
 import com.google.common.cache.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.flowables.GroupedFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.flowables.GroupedFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableGroupByTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
index ad7ba9a2a1..bed0686923 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,15 +25,15 @@
 import org.mockito.MockitoAnnotations;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableGroupJoin.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableGroupJoinTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableHideTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
index 2db3668d48..c2162b2872 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableHideTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
index cf6bb16fd1..e88319a1dd 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.observers.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableIgnoreElementsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableInternalHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
index 455f006c62..e570842c98 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
@@ -10,12 +10,12 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableInternalHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalRangeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
index 58f468b080..46cf13229b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableIntervalRangeTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
index 90b46f21d7..a5ec88c154 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.internal.operators.flowable.FlowableInterval.IntervalSubscriber;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableInterval.IntervalSubscriber;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableIntervalTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
index 88be42fe67..7c33df579c 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.MockitoAnnotations;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableJoinTest extends RxJavaTest {
     Subscriber subscriber = TestHelper.mockSubscriber();
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
index de29298682..1897d236d6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.NoSuchElementException;
@@ -21,10 +22,10 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableLiftTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
index 472adb669b..c208b8370b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,10 +20,10 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableLiftTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLimitTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimitTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableLimitTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimitTest.java
index cd0f9b80fc..897bef2a7b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableLimitTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLimitTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableLimitTest extends RxJavaTest implements LongConsumer, Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMapNotificationTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
index 832ba99303..3ec6b8f771 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableMapNotification.MapNotificationSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableMapNotification.MapNotificationSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMapNotificationTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index 5ec9cdccb3..35dba45e2b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -11,29 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMaterializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
index bc00a6347d..a6f63f3cf2 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -21,12 +21,12 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMaterializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
index 9d4ade5b3e..f80323abdd 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.LongConsumer;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.LongConsumer;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMergeDelayErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
index 45f0040f68..979c29a9aa 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -19,16 +19,15 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.schedulers.IoScheduler;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.schedulers.IoScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class FlowableMergeMaxConcurrentTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index f7186243aa..22526d1922 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -11,10 +11,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,18 +25,18 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMergeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
index 9b1310f8b5..9008168d48 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableMergeWithCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
index c4f8ec7370..f5dc759890 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,15 +22,15 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableMergeWithMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
index 5bbf30a363..b7036b8418 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,15 +22,15 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableMergeWithSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableObserveOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 4e0294ecc2..ce81203a84 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -24,21 +25,21 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.Nullable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.operators.flowable.FlowableObserveOn.BaseObserveOnSubscriber;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableObserveOn.BaseObserveOnSubscriber;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableObserveOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
index ce1c266403..91a2b3b7c5 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
@@ -11,10 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
-import static io.reactivex.BackpressureOverflowStrategy.*;
-import static io.reactivex.internal.functions.Functions.EMPTY_ACTION;
+import static io.reactivex.rxjava3.core.BackpressureOverflowStrategy.*;
+import static io.reactivex.rxjava3.internal.functions.Functions.EMPTY_ACTION;
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.TimeUnit;
@@ -23,13 +23,13 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnBackpressureBufferStrategyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index 7ca5c3ca5d..79e0d7120b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -11,25 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class FlowableOnBackpressureBufferTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDropTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDropTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
index a80cb74d20..dabf934ce3 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureDropTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
@@ -11,23 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnBackpressureDropTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
index 575d7a6e07..a2288abcb1 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnBackpressureErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
index 79f32fa143..bb52136b0e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
@@ -11,22 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableOnBackpressureLatestTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
index 2c03b58e1a..742b1e5853 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnErrorResumeNextViaFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
index 08d37c6591..72a0bf0161 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
@@ -11,28 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnErrorResumeNextViaFunctionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
index 5d77eaedcb..324cfe0eec 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
@@ -11,27 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnErrorReturnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishFunctionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index 77fb22dd41..f62616097e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -14,26 +14,25 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowablePublishFunctionTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
index 3c2e04f874..186285e1f2 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.fuseable.QueueSubscription;
-import io.reactivex.internal.operators.flowable.FlowablePublishMulticast.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowablePublishMulticast.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowablePublishMulticastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index c3d0eb43b2..0ecba3926f 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -19,24 +19,24 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamPublisher;
-import io.reactivex.internal.operators.flowable.FlowablePublish.*;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowablePublish.*;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowablePublishTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeLongTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
index c78533bf2f..afc677aefe 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
@@ -11,24 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRangeLongTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
index f444a2369b..a8d42213c9 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
@@ -11,24 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRangeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
index d752084950..bc7d1e8ece 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -22,16 +23,16 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.fuseable.HasUpstreamPublisher;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableReduceTest extends RxJavaTest {
     Subscriber subscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
index 9d79b7944a..d3da48ffe5 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReduceWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableReduceWithSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRefCountTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
index fd0259b2dd..85b38ff272 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -27,20 +27,20 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableRefCount.RefConnection;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableRefCount.RefConnection;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRefCountTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRepeatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
index f63c4d64ad..c99e09a45a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,16 +24,16 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRepeatTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
index e1e3016fbe..d17526e47b 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.management.*;
@@ -25,22 +26,22 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamPublisher;
-import io.reactivex.internal.operators.flowable.FlowableReplay.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableReplay.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableReplayEagerTruncateTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
index 1fb89cc24c..b8a7ba3e9d 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.management.*;
@@ -25,22 +26,22 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamPublisher;
-import io.reactivex.internal.operators.flowable.FlowableReplay.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableReplay.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableReplayTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
index 667ce54ded..926b37be84 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
@@ -11,32 +11,32 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.flowables.GroupedFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.flowables.GroupedFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRetryTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryWithPredicateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
index beb953f8e3..9a69dd3ede 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -21,21 +22,20 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableRetryWithPredicateTest extends RxJavaTest {
     BiPredicate retryTwice = new BiPredicate() {
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSampleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
index 90ce26047d..f9ed6509db 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -22,14 +23,14 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSampleTest extends RxJavaTest {
     private TestScheduler scheduler;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableScalarXMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
index a2c2b05d6b..60ddbbff52 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableScalarXMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableScanTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
index c688254d67..f918d152be 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,15 +24,15 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowable.*;
-import io.reactivex.flowable.FlowableEventStream.Event;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowable.*;
+import io.reactivex.rxjava3.flowable.FlowableEventStream.Event;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableScanTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
index 8bb2d5d105..e94bf06167 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
@@ -11,27 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
-import org.reactivestreams.*;
-
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSequenceEqualTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSerializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
index 577c7eae07..cd848e683d 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.*;
@@ -22,10 +23,10 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.DefaultSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSerializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
index 630476adf7..3e2fdae2a0 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,12 +24,12 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
index ecb97d5914..be4230486a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSkipLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
index 9f950e0591..87f4ddf881 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -21,13 +22,13 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSkipLastTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
index d59ffd772e..26128e5889 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
@@ -11,23 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableSkipTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
index b5f08accec..74532ad63c 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -21,11 +22,11 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSkipTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
index 7611af0f84..b579f0e5d6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSkipUntilTest extends RxJavaTest {
     Subscriber subscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipWhileTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
index 4a99d83438..3ab4f9af64 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSkipWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
@@ -11,20 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSkipWhileTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
index e5aa6b4ed5..a10283358e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
@@ -11,26 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableSubscribeOn.SubscribeOnSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableSubscribeOn.SubscribeOnSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableSubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
index 668d18b96f..9ee55f4dfa 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -19,16 +19,14 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.FlowableOperator;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
 
 public class FlowableSwitchIfEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index beade2f3ba..fa83213599 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -11,31 +11,31 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableSwitchTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOneTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
index 349a720c93..8acf9c3026 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.subscribers.DefaultSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTakeLastOneTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
index ae134dc294..764e932405 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
@@ -11,26 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTakeLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
index ad9c135915..8d21caef59 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -21,13 +22,13 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTakeLastTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
index 652d22e4e6..7af0002bf7 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
@@ -11,28 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTakeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
index ed69238e2d..34d39b125a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -21,11 +22,11 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTakeTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
index cb4fab83bc..4bdda03eb1 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTakeUntilPredicateTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
index 69acd783e1..7db84c13d8 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTakeUntilTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeWhileTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
index 2156207342..90f9cc4a59 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
@@ -11,26 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTakeWhileTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
index 278796082d..d26d49019a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -22,13 +23,13 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableThrottleFirstTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
index 4cd53f5e13..45457f5577 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
-
-import java.util.concurrent.TimeUnit;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.mockito.Mockito.*;
 
+import java.util.concurrent.TimeUnit;
+
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableThrottleLatestTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeIntervalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
index 3d4efe64a2..ac517661cb 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.mockito.Mockito.*;
 
@@ -21,13 +21,13 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTimeIntervalTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTests.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
index 1c400ac7b0..144d0da6a8 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTimeoutTests extends RxJavaTest {
     private PublishProcessor underlyingSubject;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
index 5e829f7ebe..ff0b91113a 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
@@ -11,33 +11,33 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableTimeoutWithSelectorTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
index 3a3961925f..bc8b67d737 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,14 +25,14 @@
 import org.mockito.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTimerTest extends RxJavaTest {
     @Mock
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableTimestampTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
index 967c93b76e..08bbcdc50f 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -21,12 +22,12 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableTimestampTest extends RxJavaTest {
     Subscriber subscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
index b8cc56dc1e..84c52ab2c3 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
 
@@ -21,10 +21,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Action;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class FlowableToCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToFutureTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
index 7e86199af9..28a61aa223 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.*;
@@ -21,10 +22,10 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableToFutureTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToListTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
index 315ad3c3a6..72e2bf80c6 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -22,13 +23,13 @@
 import org.mockito.Mockito;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableToListTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
index 9964b13bf3..8635158cc3 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -20,9 +21,9 @@
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableToMapTest extends RxJavaTest {
     Subscriber objectSubscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToMultimapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
index ac95318765..2413ed6afe 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -20,9 +21,9 @@
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableToMultimapTest extends RxJavaTest {
     Subscriber objectSubscriber;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
index 47b5238cce..b88824b583 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Action;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class FlowableToSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableToSortedListTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
index 3c78899090..96ec70ef69 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
@@ -11,21 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableToSortedListTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
index 77e708230f..6457f5ae26 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,14 +22,14 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableUnsubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableUsingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
index 1ad87fa85c..0422a24db2 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,20 +19,19 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableUsingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index 83826fa4ac..fcd2390f7e 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableWindowWithFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index 631bfd41d3..27eefd437d 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -11,27 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableWindowWithSizeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index 214b459350..3a76a4c7a8 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -11,27 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableWindowWithStartEndFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index 07d3290f60..c357800827 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
@@ -22,16 +22,16 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableWindowWithTimeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
index 9adc29fbf8..20814684da 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableWithLatestFromTest extends RxJavaTest {
     static final BiFunction COMBINER = new BiFunction() {
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableZipCompletionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
index d8a31a8b85..3de4aa1e39 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipCompletionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.mockito.Mockito.*;
 
@@ -19,10 +19,10 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Systematically tests that when zipping an infinite and a finite Observable,
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableZipIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
index 9e3264ef25..871b603383 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,14 +24,14 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableZipIterableTest extends RxJavaTest {
     BiFunction concat2Strings;
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/flowable/FlowableZipTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index 27d47462be..7aa44b7534 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.*;
@@ -25,17 +26,17 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueSubscription;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableZipTest extends RxJavaTest {
     BiFunction concat2Strings;
@@ -1268,7 +1269,7 @@ public void zipNArguments() throws Exception {
         for (int i = 2; i < 10; i++) {
             Class[] types = new Class[i + 1];
             Arrays.fill(types, Publisher.class);
-            types[i] = i == 2 ? BiFunction.class : Class.forName("io.reactivex.functions.Function" + i);
+            types[i] = i == 2 ? BiFunction.class : Class.forName("io.reactivex.rxjava3.functions.Function" + i);
 
             Method m = Flowable.class.getMethod("zip", types);
 
diff --git a/src/test/java/io/reactivex/internal/operators/flowable/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/flowable/NotificationLiteTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
index c2e855bf3d..dfcd611b86 100644
--- a/src/test/java/io/reactivex/internal/operators/flowable/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.flowable;
+package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.NotificationLite;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.NotificationLite;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class NotificationLiteTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
similarity index 78%
rename from src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
index fa3b9b19cd..0e953b262f 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertSame;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
-import io.reactivex.Maybe;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
 
 public class AbstractMaybeWithUpstreamTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index 10361a5ef3..3b89b06b27 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeAmbTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
index 181c9c20ab..41c6d485eb 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCacheTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
index ab2fd44591..4419d5e8c3 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
-
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCallbackObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
index c30aa26651..68ccd8434b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeConcatArrayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
index 2ab1322066..4ceb82f1e6 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeConcatIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
index c2515cd292..527de9734b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
@@ -10,13 +10,13 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.concurrent.Callable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 public class MaybeConcatPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
index ae913d239f..07a7abc77b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeContainsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
index f280578fbf..669cb4e28c 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCountTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
index efc8ce668d..b9ffc12ee8 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCreateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
index 56d204beed..8ca50837ec 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeDelayOtherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
index f2b01c0f59..bca4023f83 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDelaySubscriptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
index e667205abe..da75df361c 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDelayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
index 6fb425e7a2..25c2ce742a 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertNull;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDetachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
index a11fec7da2..b754c5150f 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDoAfterSuccessTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
index 6fa829bbeb..1be982960e 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDoFinallyTest extends RxJavaTest implements Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
index fb8797c0ed..989599f2c6 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertTrue;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeDoOnEventTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
index 3bc66d7a76..8f93185207 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Action;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeDoOnTerminateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
index bda0a2b147..c477416241 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
@@ -11,15 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 
 public class MaybeEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
index 22203fe9ed..8a42f12d5b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.BiPredicate;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiPredicate;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeEqualTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
index 6d4c7aa92a..b75eea1906 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
@@ -11,14 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
 
 public class MaybeErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
index 6a7deaec12..2647f760ce 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFilterSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
index b60040f33c..513eb8eee4 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapBiSelectorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
index 0a399926e0..a76af597b2 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
index d663deccab..a702ac234d 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeFlatMapIterableFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
index ced1a6e02a..e9d955386a 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeFlatMapIterableObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
index 11c95b371e..6faec2ab9a 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeFlatMapNotificationTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
index 2651e7bb4c..c3409aed66 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapSingleElementTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
index 903f60f84c..60b1a98f3b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.NoSuchElementException;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapSingleTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
index 21aa2f517a..bcdaa3f061 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlattenTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
index 2640aeb995..c797e81d8d 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -22,12 +22,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromActionTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
index 5ff7f4f87b..eb551defcd 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,13 +25,13 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromCallableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
index 87a3f75b22..3549901863 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamCompletableSource;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import static org.junit.Assert.assertSame;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamCompletableSource;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
 public class MaybeFromCompletableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
     public void fromCompletableNull() {
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
index e42da8ed98..82ed2f9b35 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class MaybeFromFutureTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
index 080c7697ea..6c59ecca27 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -22,12 +22,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromRunnableTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
index d563744054..989bb78985 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamSingleSource;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamSingleSource;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromSingleTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
index df58c91aab..9e90177fae 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,13 +25,13 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromSupplierTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
index 48d4e1cebf..4428b57699 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.ScalarSupplier;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeHideTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
index 44e3f9d192..c41def19d3 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeIgnoreElementTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
similarity index 80%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
index 8a8b3bbb80..5a6021a48b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
@@ -11,15 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertSame;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
 
 public class MaybeIsEmptySingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
index 691fe7f05e..a7c208d2b5 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertTrue;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeIsEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
index e332fa9ab3..6e61427a15 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
@@ -11,15 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 
 public class MaybeJustTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
similarity index 80%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
index 103271a259..5259886976 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
index 8d3f6982e0..57a0ed11ae 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeMaterializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index e68dd103e5..5d74906294 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeMergeArrayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
index 4b8f262584..8ce37cb7be 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeMergeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
index 2aa47268ae..ab4a0b8955 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
@@ -11,12 +11,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
+import io.reactivex.rxjava3.core.*;
 
 public class MaybeMergeWithTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
index 4e09a9a3c1..0e459ffffb 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeOfTypeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
index 57b3b12687..e7d5e4b31b 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeOnErrorXTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
index 60a664963b..2dce4c4524 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybePeekTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
similarity index 80%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
index bee9fe6b38..1043a848b8 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeSubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
index 2038100d65..ceed4345d3 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeSwitchIfEmptySingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
index e43e4498a9..423d6ad1ac 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeSwitchIfEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
index 7f56391fe2..e615c733e8 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeTakeUntilPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
index c764c082aa..5c7d8f956d 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeTakeUntilTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
index 4b293a3883..188db93597 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeTimeoutPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
index 1baed49110..7e30ce6a49 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeTimeoutTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
index 093985eb5b..06a54ad90c 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeTimerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
index d17925be3c..52b44e5f98 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertSame;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeToCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
index 2e9cbb343a..77d098c0ce 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeToFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
index 5b57f828e1..c201bf20f8 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertSame;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeToObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
index 085a3cf61a..9d641c9505 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
+
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.HasUpstreamMaybeSource;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeToSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
index ceabe6b9de..1e2d700136 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeUnsubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
index 3c480e7b11..79c81bf9a5 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeUsingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
index 5809853da8..aea7a478ce 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeZipArrayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
index 44e6cb8835..934e2e512c 100644
--- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
@@ -11,24 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.maybe;
+package io.reactivex.rxjava3.internal.operators.maybe;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeZipIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
index 051c2db593..9c8dfa8754 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
index e8e182abec..9c0a498db5 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
index 50b2748ca7..28c90619bb 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -21,16 +21,16 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index 4e2500aae9..ec3d2f7a5b 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -22,20 +22,20 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.mixed.FlowableConcatMapMaybe.ConcatMapMaybeSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ErrorMode;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.mixed.FlowableConcatMapMaybe.ConcatMapMaybeSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ErrorMode;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index 4e8c9e261d..3ac974da86 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -19,21 +19,21 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
-import org.reactivestreams.*;
-
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.mixed.FlowableConcatMapSingle.ConcatMapSingleSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ErrorMode;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.mixed.FlowableConcatMapSingle.ConcatMapSingleSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ErrorMode;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableConcatMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
index 8c69d43b50..5cd60792a7 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -20,16 +20,16 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableSwitchMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
index 782c7016ce..5d0c272cc4 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableSwitchMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
index 707009fda1..bcfe4a1e89 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableSwitchMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
index 9cbd1db68a..0b268e8d88 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
index 32db48fde4..b7853ccac0 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.MaybeSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
index 3cbafe04a3..540e0828af 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index bc485f6963..30f78c41a9 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -21,18 +21,18 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.mixed.ObservableConcatMapMaybe.ConcatMapMaybeMainObserver;
-import io.reactivex.internal.util.ErrorMode;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.mixed.ObservableConcatMapMaybe.ConcatMapMaybeMainObserver;
+import io.reactivex.rxjava3.internal.util.ErrorMode;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 03424521ea..2d4b46f187 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -20,17 +20,17 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.mixed.ObservableConcatMapSingle.ConcatMapSingleMainObserver;
-import io.reactivex.internal.util.ErrorMode;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.mixed.ObservableConcatMapSingle.ConcatMapSingleMainObserver;
+import io.reactivex.rxjava3.internal.util.ErrorMode;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
index 47f0c7cb31..b308119424 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSwitchMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
index cd68f3dfb2..c9a1f9a0dd 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableSwitchMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
index aab021dd8c..a59e9954ec 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableSwitchMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
index 828bd99163..8a8e745c8b 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ScalarXMapZHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
index fde69e9652..3f9fcb74de 100644
--- a/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.mixed;
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFlatMapObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
similarity index 77%
rename from src/test/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstreamTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
index 0bdf28dd77..b578dcb8f6 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/AbstractObservableWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
@@ -11,16 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertSame;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource;
 
 public class AbstractObservableWithUpstreamTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/BlockingObservableLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
index 114d658f3f..ef8e23ba21 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
@@ -11,23 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingObservableLatestTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecentTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
index 2e32497ae2..6ffd920f24 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.*;
 
 public class BlockingObservableMostRecentTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
index b59f60857f..938f757a0c 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.operators.observable.BlockingObservableNext.NextObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.BehaviorProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.operators.observable.BlockingObservableNext.NextObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.BehaviorProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingObservableNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToFutureTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
index 916436a62d..756f0b4eb3 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
@@ -13,21 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class BlockingObservableToFutureTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
index 95196c3b67..d904ed30dd 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/BlockingObservableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.operators.observable.BlockingObservableIterable.BlockingObservableIterator;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.operators.observable.BlockingObservableIterable.BlockingObservableIterator;
 
 public class BlockingObservableToIteratorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/Burst.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/Burst.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
index 32a7eb1869..4fa76d1628 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
@@ -10,14 +10,13 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
 
 /**
  * Creates {@link Observable} of a number of items followed by either an error or
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableAllTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
index 18249328dc..5934706a4d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -21,13 +22,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableAllTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 02aeb304e4..29287a7772 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -24,18 +24,18 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableAmbTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableAnyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
index 56cfc5bc0f..a79479067a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -22,13 +23,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableAnyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
similarity index 81%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableAutoConnectTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
index 261450a8c1..5ed5b3124e 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableAutoConnectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class ObservableAutoConnectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableBlockingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
index 16b61a43da..d1c6c6fc51 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
@@ -11,26 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.observers.BlockingFirstObserver;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.observers.BlockingFirstObserver;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableBlockingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index 287350096e..03c437dad9 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -25,20 +25,20 @@
 import org.junit.*;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableBuffer.BufferExactObserver;
-import io.reactivex.internal.operators.observable.ObservableBufferTimed.*;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableBuffer.BufferExactObserver;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableBufferTimed.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableBufferTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
index 67b7643599..6d49272de2 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class ObservableBufferUntilSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index 51de96e0a4..c3695b24d6 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,19 +20,18 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
-
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableCacheTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
index cdd27bb844..52576fb9b9 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
@@ -11,14 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableCastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCollectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCollectTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
index f81fa5b298..e31a2299be 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import static io.reactivex.internal.util.TestingHelper.*;
+import static io.reactivex.rxjava3.internal.util.TestingHelper.*;
 import static org.junit.Assert.*;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public final class ObservableCollectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index 204ddd6231..bb27338d84 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,18 +24,18 @@
 import org.junit.Test;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableCombineLatestTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
index c7dbd3803e..a3cd0dcdb5 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
@@ -10,7 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertTrue;
 
@@ -18,14 +18,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableConcatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapEagerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index cd646dcd21..4e9a2b0d1f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -22,16 +22,16 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatMapEagerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index baa84610f5..1b7bb0d8b8 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,21 +20,21 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
-
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatMapSchedulerTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
index 6836e3743c..6508069822 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableConcatMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 982767f15e..6f436a56cc 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,17 +24,17 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableConcatTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
index 33ae622f9e..65d85f20d5 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.CompletableSubject;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 
 public class ObservableConcatWithCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
index 8842a2a611..4d4f94954a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.MaybeSubject;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 
 public class ObservableConcatWithMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
index c2c695d17e..73a0ff3c0d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 
 public class ObservableConcatWithSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCountTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
index a5c8773137..4207fee66f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableCountTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index 8c3506c26c..4a22746c54 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableCreateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index a8374a2dfe..d66de923f8 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,17 +25,17 @@
 import org.mockito.InOrder;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableDebounceTimed.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableDebounceTimed.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDebounceTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDefaultIfEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
index d37579b68c..1ca00cf1b4 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDefaultIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
@@ -11,14 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableDefaultIfEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDeferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
index 6f7e8c231a..6af2513bcb 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 @SuppressWarnings("unchecked")
 public class ObservableDeferTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
index 4f317398e6..604321a714 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableDelaySubscriptionOtherTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDelayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
index 1316d7c7e8..cc93594bb8 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,16 +24,16 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableDelayTest extends RxJavaTest {
     private Observer observer;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDematerializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
index 2fe9ae647d..84a6b06b06 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
@@ -11,21 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDematerializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDetachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
index 6b809eb6e8..ef67be319e 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.lang.ref.WeakReference;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableDetachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
index 9cf7feee01..da842b1f9b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
@@ -11,27 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDistinctTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChangedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index 0cdc5f82a1..f28a9fb18b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -21,15 +22,15 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDistinctUntilChangedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDoAfterNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index c90f76278b..f5f2e8feb6 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -11,23 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.*;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDoAfterNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDoFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index a514ebd588..9fd860816a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDoFinallyTest extends RxJavaTest implements Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnEachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index 839e5d9d03..4205fad5e2 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -22,16 +23,16 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableDoOnEachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
index 0e246f2656..ef57c50225 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableDoOnSubscribeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
index 7db29bbb34..c90105fb04 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,14 +19,14 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public class ObservableDoOnUnsubscribeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableElementAtTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
index 95dbd061ab..a11255abf2 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableElementAtTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFilterTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
index dd3a52f2b3..22cd6c060a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
@@ -11,20 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFilterTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
index 2bda2a03ee..7767ddb9fc 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Action;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFinallyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFirstTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
index ca176e3c92..e022144ce2 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
@@ -11,18 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.util.NoSuchElementException;
+
 import org.junit.*;
 import org.mockito.InOrder;
 
-import java.util.NoSuchElementException;
-
-import io.reactivex.*;
-import io.reactivex.functions.Predicate;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFirstTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index 010201262e..b07a13a6de 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
index b1a25797e1..fbd55ae32a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
@@ -11,27 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
-import java.util.*;
+import java.util.List;
 import java.util.concurrent.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
index 3851bf9edc..77db13d5a1 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
@@ -11,27 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
-import java.util.*;
+import java.util.List;
 import java.util.concurrent.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 6830f8af49..cf31f26c3a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -23,18 +23,18 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFlattenIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
index ce2dbc0126..2fdf6b24f3 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFlattenIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableForEachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
index db89ab942e..cd7273a282 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
@@ -11,23 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableForEachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFromCallableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
index da737a67d6..448c4132a8 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
@@ -14,26 +14,27 @@
  * the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.*;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFromCallableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index c7e0e289eb..4cd33b78e9 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.observers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFromIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFromSupplierTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
index 6f91833346..955bb3f50e 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
@@ -14,9 +14,10 @@
  * the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -26,14 +27,14 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFromSupplierTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableFromTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
index 34860d473c..778520fa4f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,11 +19,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFromTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableGenerateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
index 69581b36ff..19735a3ad4 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,12 +19,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableGenerateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index 7e657d6acc..a7ac22a95a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,18 +24,18 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observables.GroupedObservable;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observables.GroupedObservable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableGroupByTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableGroupJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
index 668c44f875..5998e37a64 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
@@ -13,29 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.MockitoAnnotations;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableGroupJoin.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableGroupJoin.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableGroupJoinTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableHideTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
index 0f48e67cd9..45361b1aed 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
@@ -11,18 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableHideTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
index e01eb5d9d6..e5704dfd46 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableIgnoreElementsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableInternalHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
index 9fd6aba614..9c02f95ebb 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableInternalHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalRangeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
index e39086564d..95f26637bf 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,9 +19,9 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableIntervalRangeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
similarity index 80%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
index 0d243ad948..11fe98a669 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.internal.operators.observable.ObservableInterval.IntervalObserver;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableInterval.IntervalObserver;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableIntervalTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
index bd68fec0fd..f10e62016d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -22,15 +23,15 @@
 import org.junit.*;
 import org.mockito.MockitoAnnotations;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableJoinTest extends RxJavaTest {
     Observer observer = TestHelper.mockObserver();
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
index 17192092cf..0bd5868332 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.NoSuchElementException;
@@ -21,10 +22,10 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableLiftTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
index 1db87fc9d9..325fc504ae 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 public class ObservableLiftTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMapNotificationTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
index 8c6079fdd2..ee8931853f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableMapNotification.MapNotificationObserver;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableMapNotification.MapNotificationObserver;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMapNotificationTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
index 0be3403349..da5651214f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.UnicastSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.UnicastSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
index 08d272bb4d..4549f6c514 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.functions.*;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMaterializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index af874adc39..82fd2e28fa 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -11,24 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.*;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMergeDelayErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
index e9c2ea46e9..8132fbe229 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,17 +19,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.internal.schedulers.IoScheduler;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.internal.schedulers.IoScheduler;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMergeMaxConcurrentTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
index b0f5f86271..8736bd4ae3 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -22,17 +23,17 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableMergeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
index c54a13d28d..8cdb78df76 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableMergeWithCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
index 0d7c3e0b3b..5fd7763825 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,14 +21,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableMergeWithMaybeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
index fa13cb2133..a4e38c0936 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,14 +21,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableMergeWithSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableObserveOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index 815535214f..c51d36f0d0 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,22 +24,22 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.annotations.Nullable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.operators.flowable.FlowableObserveOnTest.DisposeTrackingScheduler;
-import io.reactivex.internal.operators.observable.ObservableObserveOn.ObserveOnObserver;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableObserveOnTest.DisposeTrackingScheduler;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableObserveOn.ObserveOnObserver;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableObserveOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
index a1edf3e487..2761a6c14b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
@@ -11,26 +11,27 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableOnErrorResumeNextTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeWithTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
index dd7327c7d4..217335ec08 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorResumeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
@@ -11,22 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableOnErrorResumeWithTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
index bec8f00b9a..3f20a8a7db 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -22,13 +23,13 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableOnErrorReturnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
index 06e76ed912..38f0140e5d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,20 +21,20 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservablePublishTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRangeLongTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
index 1608d86b37..e25cb17b8a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -21,11 +22,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRangeLongTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRangeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
index f6c826ed80..2f9374ad5a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -21,11 +22,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRangeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRedoTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRedoTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
index 546b6eaa4e..cac0b75d1a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRedoTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
 
 public class ObservableRedoTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableReduceTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
index f05ee178a5..f05e007068 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
@@ -11,22 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableReduceTest extends RxJavaTest {
     Observer observer;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index 4c8e721c95..62747c480a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -23,24 +23,24 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableRefCount.RefConnection;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableRefCount.RefConnection;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRefCountTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
index a8b6e72ce3..55906d1214 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
@@ -11,29 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRepeatTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableReplayEagerTruncateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
index 348aa71be3..e1c0bf6f8c 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -25,23 +25,23 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
-import io.reactivex.internal.operators.observable.ObservableReplay.*;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableReplay.*;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableReplayEagerTruncateTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index 952d2bcade..5ef40f340c 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.management.*;
@@ -21,27 +22,26 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
-import io.reactivex.internal.operators.observable.ObservableReplay.*;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableReplay.*;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableReplayTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableResourceWrapperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
index 042d78b94b..9143762a5a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableResourceWrapperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 3e090e9b1b..26377c742c 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,20 +24,20 @@
 import org.junit.Test;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observables.GroupedObservable;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observables.GroupedObservable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRetryTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
index 33e89c1b33..38f293cb4a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
@@ -21,20 +22,19 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRetryWithPredicateTest extends RxJavaTest {
     BiPredicate retryTwice = new BiPredicate() {
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
index f2031bce02..5335a75475 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,14 +21,14 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSampleTest extends RxJavaTest {
     private TestScheduler scheduler;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableScalarXMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
index da74a3d2d6..13b01e6888 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableScalarXMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableScanTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
index c87fd21f51..5a7d312ede 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableScanTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
index cb5f6d0554..3d805ec79a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.BiPredicate;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiPredicate;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSequenceEqualTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
index 66a9349995..b0023e2989 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.*;
@@ -21,10 +22,10 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSerializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSingleTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
index 770cfa8910..4c7faeaf3e 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Test;
-import org.mockito.InOrder;
-
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import org.junit.Test;
+import org.mockito.InOrder;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
index 6effa05218..7b87b3e329 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
@@ -11,23 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSkipLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
index 453b50136d..d0a1b24fa2 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,13 +21,13 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSkipLastTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
index c87cdd3e94..d122e23399 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
@@ -11,18 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableSkipTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
index 41497a9ede..1c3fc30e14 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,11 +21,11 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSkipTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
index b4e3697631..290fc2c1f0 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSkipUntilTest extends RxJavaTest {
     Observer observer;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSkipWhileTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
index ed94331d01..ab1abdfa49 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSkipWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSkipWhileTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
index 559d8a00f1..8d2a1706ba 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableSubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
index fd9c25a2b1..00948a6e7f 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,10 +20,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.observers.DefaultObserver;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.observers.DefaultObserver;
 
 public class ObservableSwitchIfEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index eb72e2725d..dadabeeea3 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -24,20 +24,20 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableSwitchTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastOneTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
index bbe15ded49..63161e7fb8 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,10 +19,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTakeLastOneTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
index 9f9c642fc8..90429038e6 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
@@ -11,23 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTakeLastTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
index 08afe08308..a1c7c40314 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,12 +21,12 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTakeLastTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
index 4918d65d0f..73e2cc33c7 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
@@ -11,30 +11,30 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTakeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTimedTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
index 6c96008263..32f6049afb 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,11 +21,11 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTakeTimedTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
index ed12245544..b197d0bd89 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
@@ -11,22 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 ;
 
 public class ObservableTakeUntilPredicateTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
index 314d5b7521..790af0c882 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTakeUntilTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
index e946b35713..7c30166bb3 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
@@ -11,21 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTakeWhileTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
index e322804b30..416c248f6a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -21,13 +22,13 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableThrottleFirstTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleLatestTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
index 3b9d9e4d64..5399f63fce 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.mockito.Mockito.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableThrottleLatestTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTimeIntervalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
index 958317eb81..7eecc75fb5 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.mockito.Mockito.*;
 
@@ -20,13 +20,13 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTimeIntervalTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
index effe1031e8..f1bb9e7bfe 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
@@ -11,10 +11,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -23,14 +24,14 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTimeoutTests extends RxJavaTest {
     private PublishSubject underlyingSubject;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
index 588d641c0e..e590ec1663 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
@@ -11,33 +11,33 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTimeoutWithSelectorTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
index 5b21b2b172..ae1d856b0b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -23,16 +24,16 @@
 import org.junit.*;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.operators.observable.ObservableTimer.TimerObserver;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableTimer.TimerObserver;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTimerTest extends RxJavaTest {
     @Mock
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableTimestampTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
index 9bd5a023ae..7148a44a4a 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -20,12 +21,12 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableTimestampTest extends RxJavaTest {
     Observer observer;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToFutureTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
index 377bdc7754..481fd8ae65 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.*;
@@ -20,10 +21,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableToFutureTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToListTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
index 0ece2b15dc..33766df112 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
@@ -11,8 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -21,12 +22,12 @@
 import org.junit.*;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableToListTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
index 4dcaa520aa..25136fcd9d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableToMapTest extends RxJavaTest {
     Observer objectObserver;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToMultimapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
index 7a63a0a570..ef7f0feec4 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
@@ -11,19 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableToMultimapTest extends RxJavaTest {
     Observer objectObserver;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToSortedListTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
index 39b3ceacf2..7d01bcc3b1 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -22,10 +23,10 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableToSortedListTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
index dc1b522f84..1afbba0225 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableToXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
-import io.reactivex.exceptions.MissingBackpressureException;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class ObservableToXTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
index 677559eb8c..ce8eee9b50 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,14 +21,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableUnsubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
index 047bc80ce4..62e8986292 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
@@ -11,27 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableUsingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index 63f8df8db2..1ac8c7209b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -11,29 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableWindowWithObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index c0256de77b..e90d46bd36 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -19,19 +19,18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableWindowWithSizeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index bbcadea710..90732ddf1e 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -11,28 +11,28 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableWindowWithStartEndObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index f7fe5bd1c2..ca9270448b 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableWindowWithTimeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
index 6b0999d8ad..f87491e0e0 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
@@ -11,28 +11,29 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableWithLatestFromTest extends RxJavaTest {
     static final BiFunction COMBINER = new BiFunction() {
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableZipCompletionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
index 038fc35598..76d14495db 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipCompletionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Systematically tests that when zipping an infinite and a finite Observable,
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableZipIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
index 45cf02a6d3..53fd62d50d 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -22,16 +23,16 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableZipIterableTest extends RxJavaTest {
     BiFunction concat2Strings;
diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index 65443ba223..369840cbc7 100644
--- a/src/test/java/io/reactivex/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.observable;
+package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,17 +24,17 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableZipTest extends RxJavaTest {
     BiFunction concat2Strings;
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
index 8c8011f30e..bb333f45f2 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.BiConsumer;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiConsumer;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleAmbTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
index 4a4457cd5e..28eb94110b 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleCacheTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
index 692a3a0cce..bd31e28430 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
@@ -10,13 +10,13 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.concurrent.Callable;
 
 import org.junit.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 public class SingleConcatPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
index 03e22acc93..eebe0c1020 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
@@ -11,20 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.Arrays;
 
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
-
 import org.junit.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleConcatTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
similarity index 85%
rename from src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
index c8761dfeea..4a991c4cbf 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
@@ -11,14 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.BiPredicate;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiPredicate;
 
 public class SingleContainstTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
index b24e469e85..98c0a67903 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -20,12 +20,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleCreateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
index 6c5539bcb8..962a3694c2 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
@@ -11,13 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Supplier;
 
 public class SingleDeferTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
index c2cc05026f..4f97e5c6bf 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertNotEquals;
 
@@ -22,16 +22,16 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDelayTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
index d9e0ca4929..5bf1409498 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDematerializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
index c50810bffd..1b7f5e7a34 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertNull;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDetachTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
index e7bc12f133..679eac1e64 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDoAfterSuccessTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
index 20d424b86b..3096263c88 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
@@ -11,23 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
-
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDoAfterTerminateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
index 85298a9268..22f6e45c29 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,12 +19,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDoFinallyTest extends RxJavaTest implements Action {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
index c669c709a8..58ba686e81 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Action;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleDoOnTerminateTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
index 74d3c36686..9bea6e178c 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleDoOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
index 2cb39a386e..c664784869 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleEqualsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
index d46dad784b..b3619b5992 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
@@ -11,14 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
 
 public class SingleErrorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
index ce4972f48b..6e663394e5 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFlatMapCompletableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
index 23ed87beb0..3fa9a2b462 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleFlatMapIterableFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
index f9a12c3e78..00fc69fdd9 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.util.CrashingIterable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleFlatMapIterableObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
index 4f231f1120..b98bf5537f 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFlatMapMaybeTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
index 0626770d43..1845a4967d 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -20,10 +20,10 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleFlatMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
index 00a9b83fef..3a57499a2f 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
@@ -11,28 +11,26 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFromCallableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
index 821102fc57..74261bc7dd 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFromPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
index abd6515c44..4cb6bf389f 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,13 +25,13 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFromSupplierTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
index 395c8bac38..46847bedd3 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.concurrent.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class SingleFromTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
similarity index 81%
rename from src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
index cf12cc63db..9c5609b571 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleHideTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
index 6b318966ab..e551b882d1 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,8 +19,8 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleInternalHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
index df96ce4f42..1638cb993f 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class SingleLiftTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
index c4108fadd4..1ae83e9158 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
@@ -11,15 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
index 8244ce5875..00b5f8d712 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.SingleSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleMaterializeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
index b8e65f9b21..ee991b431b 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertTrue;
 
@@ -19,10 +19,10 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleMergeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
index b630fcb25e..bf6e4fa8cf 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
@@ -11,28 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
-
-import io.reactivex.RxJavaTest;
-import io.reactivex.Single;
-import io.reactivex.SingleObserver;
-import io.reactivex.SingleSource;
-import io.reactivex.SingleTransformer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.schedulers.Schedulers;
-import org.junit.Test;
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class SingleMiscTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
index 5df83dcae0..afb4494bef 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleObserveOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
index c3030889fc..990a0fdec6 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.List;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleOnErrorXTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
similarity index 80%
rename from src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
index 96948b0362..0c22190691 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleSubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
index d43a2144e2..0a2d27340a 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -21,14 +21,14 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleTakeUntilTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
index 7c1d5aa54f..7c51e8be91 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
@@ -11,25 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleTimeoutTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
index 8d6357f164..2924364459 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleTimerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
index a09b7938df..f4c344c801 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
@@ -11,17 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
-
-import io.reactivex.RxJavaTest;
-import io.reactivex.Single;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
 public class SingleToFlowableTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
similarity index 82%
rename from src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
index cd2bb0ede8..35d38d49c7 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleToObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
index a1cff56532..d28c47ad08 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleUnsubscribeOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
index 6214a129b5..c1463923cf 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleUsingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
index a01806b686..18f799b3a2 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleZipArrayTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
index 2c81453d7a..4b49394242 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
 
 import static org.junit.Assert.*;
 
@@ -19,15 +19,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.util.CrashingMappedIterable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleZipIterableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
index 4b8cafe8a2..f5ae16d0bc 100644
--- a/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
@@ -11,18 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.operators.single;
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.*;
-
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
 
 public class SingleZipTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
index b7c01db392..d58918d04d 100644
--- a/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
@@ -16,15 +16,16 @@
  * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic
  */
 
-package io.reactivex.internal.queue;
+package io.reactivex.rxjava3.internal.queue;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class SimpleQueueTest extends RxJavaTest {
 
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
index b7b1731e22..85507fb7f1 100644
--- a/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.FutureTask;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class AbstractDirectTaskTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
index 4e5c3ef0e9..59ad5d1dfc 100644
--- a/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class ComputationSchedulerInternalTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
index 579485db51..19a68d0818 100644
--- a/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
 
 public class DisposeOnCancelTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
index 2ce9137742..08e06b189e 100644
--- a/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.schedulers.ExecutorScheduler.DelayedRunnable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.schedulers.ExecutorScheduler.DelayedRunnable;
 
 public class ExecutorSchedulerDelayedRunnableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
similarity index 91%
rename from src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
index 67da7183c4..cacb8fabeb 100644
--- a/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class ImmediateThinSchedulerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
index e3dedfbd29..577aa468de 100644
--- a/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class InstantPeriodicTaskTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
index d53a82bd2c..83a65e65ac 100644
--- a/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class RxThreadFactoryTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
similarity index 83%
rename from src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
index 55398b690e..23afeca2ce 100644
--- a/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ScheduledDirectPeriodicTaskTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
index c168562035..58305b7e9e 100644
--- a/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ScheduledRunnableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
similarity index 92%
rename from src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
index 873c9ddc2c..332a115604 100644
--- a/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SchedulerMultiWorkerSupportTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
index c13757eeaa..9bf100fbbb 100644
--- a/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.Properties;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.schedulers.SchedulerPoolFactory.PurgeProperties;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.schedulers.SchedulerPoolFactory.PurgeProperties;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SchedulerPoolFactoryTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
index 4596c624b2..8225fd4e06 100644
--- a/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
@@ -11,9 +11,9 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
-import static io.reactivex.Flowable.*;
+import static io.reactivex.rxjava3.core.Flowable.*;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.schedulers.SchedulerWhen.*;
-import io.reactivex.observers.DisposableCompletableObserver;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.schedulers.SchedulerWhen.*;
+import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SchedulerWhenTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
index d42d8b7f0d..82f66ceff6 100644
--- a/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
@@ -11,22 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.schedulers.AbstractSchedulerTests;
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.SingleScheduler.ScheduledWorker;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.SingleScheduler.ScheduledWorker;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleSchedulerTest extends AbstractSchedulerTests {
 
diff --git a/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
index 42e031f791..e30400214c 100644
--- a/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package io.reactivex.internal.schedulers;
+package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.TrampolineScheduler.*;
-import io.reactivex.schedulers.Schedulers;
-import static org.mockito.Mockito.*;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class TrampolineSchedulerInternalTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
similarity index 86%
rename from src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
index b9fd51a13c..0bcfd2d12a 100644
--- a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.annotations.Nullable;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.internal.fuseable.ConditionalSubscriber;
-import io.reactivex.internal.subscriptions.ScalarSubscription;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BasicFuseableConditionalSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
similarity index 81%
rename from src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
index e3a9f22caf..b3543ad7d3 100644
--- a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.annotations.Nullable;
 import org.junit.Test;
 
-import io.reactivex.internal.subscriptions.ScalarSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BasicFuseableSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
index 97afd2f416..f127e60c44 100644
--- a/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
 import java.util.ArrayDeque;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
index 003bb2f68d..c2d843fb23 100644
--- a/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
@@ -11,32 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
-
-import io.reactivex.Flowable;
-import io.reactivex.RxJavaTest;
-import io.reactivex.exceptions.CompositeException;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+package io.reactivex.rxjava3.internal.subscribers;
 
-import org.junit.Test;
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
+import static org.junit.Assert.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BoundedSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
index 43ae7b9846..fcc3a2f8ea 100644
--- a/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
@@ -25,15 +25,15 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DeferredScalarSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
similarity index 79%
rename from src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
index a8f79b7193..d2d9b91163 100644
--- a/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
@@ -11,21 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.EmptyComponent;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.EmptyComponent;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class EmptyComponentTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
index 19bb89a356..fb75eb46b0 100644
--- a/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
@@ -11,23 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
-import static io.reactivex.internal.util.ExceptionHelper.timeoutMessage;
+import static io.reactivex.rxjava3.internal.util.ExceptionHelper.timeoutMessage;
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscribers.FutureSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FutureSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
index cfbe3214b8..f613bada98 100644
--- a/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
-import java.util.*;
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
+import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class InnerQueuedSubscriberTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
index 26f313cdf7..18cde98c75 100644
--- a/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
@@ -11,24 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
-
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.flowable.FlowableInternalHelper;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.testsupport.TestHelper;
+package io.reactivex.rxjava3.internal.subscribers;
 
-import org.junit.Test;
-import org.reactivestreams.*;
+import static org.junit.Assert.*;
 
 import java.util.*;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableInternalHelper;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class LambdaSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
index 0cdfcaeec6..74bfb0c626 100644
--- a/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
@@ -11,23 +11,23 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.internal.queue.SpscArrayQueue;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class QueueDrainSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
index 424a56af35..c60ccf8920 100644
--- a/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SinglePostCompleteSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
index 038a61a058..a94b034166 100644
--- a/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class StrictSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
similarity index 88%
rename from src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
index 206ddaee8e..76ed844842 100644
--- a/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscribers;
+package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SubscriberResourceWrapperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
index a0d967d67b..9dd0cab6a5 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ArrayCompositeSubscriptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
index bc31fde7d9..30d93a22ae 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class AsyncSubscriptionTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
index 15772bf7a8..0f42ba85b6 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DeferredScalarSubscriptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
similarity index 90%
rename from src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
index 6cd747d4c2..fb3f66397f 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.annotations.Nullable;
-import io.reactivex.testsupport.TestHelper;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class QueueSubscriptionTest extends RxJavaTest {
     static final class EmptyQS extends BasicQueueSubscription {
diff --git a/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
index c7893cf432..275b15f73c 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ScalarSubscriptionTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
index 0b1cb35dbd..4651b2e3b8 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SubscriptionArbiterTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
index 225d589ebc..a28a2dd4e5 100644
--- a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
@@ -11,20 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.subscriptions;
+package io.reactivex.rxjava3.internal.subscriptions;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.*;
+
 import java.util.List;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.exceptions.ProtocolViolationException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.ProtocolViolationException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SubscriptionHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
index 9c2024f4e7..377fd6c873 100644
--- a/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
@@ -19,14 +19,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class AtomicThrowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
index d5a9cf6129..ca0b0e2668 100644
--- a/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BackpressureHelperTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
similarity index 87%
rename from src/test/java/io/reactivex/internal/util/BlockingHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
index 774699edd0..7d4e07dab4 100644
--- a/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BlockingHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/CrashingIterable.java b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/util/CrashingIterable.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
index 483d2b46f3..bb053c23b0 100644
--- a/src/test/java/io/reactivex/internal/util/CrashingIterable.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
@@ -11,11 +11,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import java.util.Iterator;
 
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 /**
  * An Iterable and Iterator that crashes with TestException after the given number
diff --git a/src/test/java/io/reactivex/internal/util/CrashingMappedIterable.java b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/util/CrashingMappedIterable.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
index 90c1918e18..53089322ea 100644
--- a/src/test/java/io/reactivex/internal/util/CrashingMappedIterable.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import java.util.Iterator;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
 
 /**
  * An Iterable and Iterator that crashes with TestException after the given number
diff --git a/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
similarity index 95%
rename from src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
index 22c0914e48..0ff03f24c2 100644
--- a/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 import org.junit.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.ProtocolViolationException;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.ProtocolViolationException;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class EndConsumerHelperTest extends RxJavaTest {
 
@@ -119,7 +119,7 @@ public void checkDoubleDefaultSubscriberNonAnonymous() {
         TestHelper.assertError(errors, 0, ProtocolViolationException.class);
 
         // with this consumer, the class name should be predictable
-        assertEquals(EndConsumerHelper.composeMessage("io.reactivex.internal.util.EndConsumerHelperTest$EndDefaultSubscriber"), errors.get(0).getMessage());
+        assertEquals(EndConsumerHelper.composeMessage("io.reactivex.rxjava3.internal.util.EndConsumerHelperTest$EndDefaultSubscriber"), errors.get(0).getMessage());
         assertEquals(errors.toString(), 1, errors.size());
     }
 
diff --git a/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
similarity index 89%
rename from src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
index b36d733ef7..666718a1f5 100644
--- a/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ExceptionHelperTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
index a07a3b8cf3..2171fadc2d 100644
--- a/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
@@ -10,21 +10,20 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class HalfSerializerObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
index 147d4227b1..d7c472e660 100644
--- a/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
@@ -10,22 +10,21 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class HalfSerializerSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
index f56f9b0445..c8a0968729 100644
--- a/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class MergerBiFunctionTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
similarity index 96%
rename from src/test/java/io/reactivex/internal/util/MiscUtilTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
index c9668ef9a0..d0b627afaa 100644
--- a/src/test/java/io/reactivex/internal/util/MiscUtilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.functions.*;
-import io.reactivex.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.BiPredicate;
+import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MiscUtilTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
similarity index 84%
rename from src/test/java/io/reactivex/internal/util/NotificationLiteTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
index cf12f1b5ad..0149b14f4e 100644
--- a/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.testsupport.TestObserverEx;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
 public class NotificationLiteTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/ObservableToFlowabeTestSync.java b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
similarity index 98%
rename from src/test/java/io/reactivex/internal/util/ObservableToFlowabeTestSync.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
index d71a6020c5..02b64e2772 100644
--- a/src/test/java/io/reactivex/internal/util/ObservableToFlowabeTestSync.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import java.io.*;
 import java.lang.reflect.Method;
diff --git a/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
similarity index 93%
rename from src/test/java/io/reactivex/internal/util/OpenHashSetTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
index a17c8c0c68..e424298e46 100644
--- a/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class OpenHashSetTest extends RxJavaTest {
 
     static class Value {
diff --git a/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
index 619166e8e2..9060e85c45 100644
--- a/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
@@ -19,19 +19,19 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.BooleanSupplier;
-import io.reactivex.internal.queue.SpscArrayQueue;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.BooleanSupplier;
+import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class QueueDrainHelperTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/internal/util/TestingHelper.java b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
similarity index 94%
rename from src/test/java/io/reactivex/internal/util/TestingHelper.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
index 7ddbe2f33f..867f518d60 100644
--- a/src/test/java/io/reactivex/internal/util/TestingHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import java.util.*;
 
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.functions.*;
 
 public final class TestingHelper {
 
diff --git a/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
similarity index 97%
rename from src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
index 162af9f43b..e087542ff3 100644
--- a/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.internal.util;
+package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class VolatileSizeArrayListTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
similarity index 93%
rename from src/test/java/io/reactivex/maybe/MaybeCreateTest.java
rename to src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
index 8f00eade83..d681c85c0c 100644
--- a/src/test/java/io/reactivex/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.maybe;
+package io.reactivex.rxjava3.maybe;
 
 import static org.junit.Assert.assertTrue;
 
@@ -19,12 +19,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Cancellable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCreateTest extends RxJavaTest {
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/maybe/MaybeRetryTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
similarity index 95%
rename from src/test/java/io/reactivex/maybe/MaybeRetryTest.java
rename to src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
index 3768d87201..f260a78a82 100644
--- a/src/test/java/io/reactivex/maybe/MaybeRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.maybe;
+package io.reactivex.rxjava3.maybe;
+
+import static org.junit.Assert.assertEquals;
 
-import io.reactivex.Maybe;
-import io.reactivex.RxJavaTest;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class MaybeRetryTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
similarity index 99%
rename from src/test/java/io/reactivex/maybe/MaybeTest.java
rename to src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index ecb2d1d6b8..3796f365c0 100644
--- a/src/test/java/io/reactivex/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.maybe;
+package io.reactivex.rxjava3.maybe;
 
 import static org.junit.Assert.*;
 
@@ -24,22 +24,22 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.operators.flowable.FlowableZipTest.ArgsToString;
-import io.reactivex.internal.operators.maybe.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableZipTest.ArgsToString;
+import io.reactivex.rxjava3.internal.operators.maybe.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
similarity index 89%
rename from src/test/java/io/reactivex/maybe/MaybeTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
index d2b8615f67..03f229483b 100644
--- a/src/test/java/io/reactivex/maybe/MaybeTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.maybe;
+package io.reactivex.rxjava3.maybe;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.Maybe;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.TestScheduler;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
 
 public class MaybeTimerTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/observable/ObservableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
similarity index 91%
rename from src/test/java/io/reactivex/observable/ObservableCombineLatestTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
index de1f36210b..b4b11420d1 100644
--- a/src/test/java/io/reactivex/observable/ObservableCombineLatestTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
-import io.reactivex.observable.ObservableCovarianceTest.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observable.ObservableCovarianceTest.*;
 
 public class ObservableCombineLatestTests extends RxJavaTest {
     /**
diff --git a/src/test/java/io/reactivex/observable/ObservableConcatTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
similarity index 96%
rename from src/test/java/io/reactivex/observable/ObservableConcatTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
index ef1cb52942..a9d1afca12 100644
--- a/src/test/java/io/reactivex/observable/ObservableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
@@ -10,19 +10,18 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.observable.ObservableCovarianceTest.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.observable.ObservableCovarianceTest.*;
 
 public class ObservableConcatTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
similarity index 96%
rename from src/test/java/io/reactivex/observable/ObservableCovarianceTest.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
index 52bd79c4f2..904af1d8a4 100644
--- a/src/test/java/io/reactivex/observable/ObservableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.functions.*;
-import io.reactivex.observables.GroupedObservable;
-import io.reactivex.testsupport.TestObserverEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observables.GroupedObservable;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
 /**
  * Test super/extends of generics.
diff --git a/src/test/java/io/reactivex/observable/ObservableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
similarity index 94%
rename from src/test/java/io/reactivex/observable/ObservableDoOnTest.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
index a5eb00f5cc..1e28d19b24 100644
--- a/src/test/java/io/reactivex/observable/ObservableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
@@ -11,18 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
 
 public class ObservableDoOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
similarity index 94%
rename from src/test/java/io/reactivex/observable/ObservableErrorHandlingTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
index cab1c69fc4..bbbc80daed 100644
--- a/src/test/java/io/reactivex/observable/ObservableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -20,9 +20,9 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ObservableErrorHandlingTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableEventStream.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
similarity index 93%
rename from src/test/java/io/reactivex/observable/ObservableEventStream.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
index b8bef7c54a..c60f694209 100644
--- a/src/test/java/io/reactivex/observable/ObservableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import java.util.*;
 
-import io.reactivex.Emitter;
-import io.reactivex.Observable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Emitter;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Utility for retrieving a mock eventstream for testing.
diff --git a/src/test/java/io/reactivex/observable/ObservableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
similarity index 93%
rename from src/test/java/io/reactivex/observable/ObservableFuseableTest.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
index 1ab776206b..1d01a790ab 100644
--- a/src/test/java/io/reactivex/observable/ObservableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
@@ -10,16 +10,15 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import java.util.Arrays;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFuseableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableGroupByTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
similarity index 92%
rename from src/test/java/io/reactivex/observable/ObservableGroupByTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
index f28f8d0a31..e5de6cdc85 100644
--- a/src/test/java/io/reactivex/observable/ObservableGroupByTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
@@ -11,15 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
-import io.reactivex.observable.ObservableEventStream.Event;
-import io.reactivex.observables.GroupedObservable;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observable.ObservableEventStream.Event;
+import io.reactivex.rxjava3.observables.GroupedObservable;
 
 public class ObservableGroupByTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableMergeTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
similarity index 94%
rename from src/test/java/io/reactivex/observable/ObservableMergeTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
index abb91bf9df..902bcd7ba1 100644
--- a/src/test/java/io/reactivex/observable/ObservableMergeTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
@@ -11,18 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.Supplier;
-import io.reactivex.observable.ObservableCovarianceTest.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.observable.ObservableCovarianceTest.*;
 
 public class ObservableMergeTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
similarity index 99%
rename from src/test/java/io/reactivex/observable/ObservableNullTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 263b49320c..41cfb91bb2 100644
--- a/src/test/java/io/reactivex/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import java.lang.reflect.*;
 import java.util.*;
@@ -19,15 +19,15 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Verifies the operators handle null values properly by emitting/throwing NullPointerExceptions.
diff --git a/src/test/java/io/reactivex/observable/ObservableReduceTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
similarity index 96%
rename from src/test/java/io/reactivex/observable/ObservableReduceTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
index ddb601276d..8dec71b98e 100644
--- a/src/test/java/io/reactivex/observable/ObservableReduceTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.observable.ObservableCovarianceTest.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.observable.ObservableCovarianceTest.*;
 
 public class ObservableReduceTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableScanTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
similarity index 88%
rename from src/test/java/io/reactivex/observable/ObservableScanTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
index 2382c37840..195c7d5865 100644
--- a/src/test/java/io/reactivex/observable/ObservableScanTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import java.util.HashMap;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.functions.*;
-import io.reactivex.observable.ObservableEventStream.Event;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observable.ObservableEventStream.Event;
 
 public class ObservableScanTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
similarity index 94%
rename from src/test/java/io/reactivex/observable/ObservableStartWithTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
index a16f03c224..c8a195d826 100644
--- a/src/test/java/io/reactivex/observable/ObservableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
 
 public class ObservableStartWithTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/observable/ObservableSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
index b1b38a5bdd..6fc73f4468 100644
--- a/src/test/java/io/reactivex/observable/ObservableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
 
@@ -20,15 +20,15 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableSubscriberTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
similarity index 98%
rename from src/test/java/io/reactivex/observable/ObservableTest.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index d9398bde2a..4d26afe20d 100644
--- a/src/test/java/io/reactivex/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -23,17 +24,17 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
similarity index 89%
rename from src/test/java/io/reactivex/observable/ObservableThrottleLastTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
index 9d996fd0ab..e93f9409e0 100644
--- a/src/test/java/io/reactivex/observable/ObservableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.mockito.Mockito.inOrder;
 
@@ -20,10 +20,10 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableThrottleLastTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
similarity index 90%
rename from src/test/java/io/reactivex/observable/ObservableThrottleWithTimeoutTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
index 3391e5c5fc..bcacab5513 100644
--- a/src/test/java/io/reactivex/observable/ObservableThrottleWithTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.mockito.Mockito.inOrder;
 
@@ -20,10 +20,10 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import io.reactivex.*;
-import io.reactivex.schedulers.TestScheduler;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableThrottleWithTimeoutTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableWindowTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
similarity index 90%
rename from src/test/java/io/reactivex/observable/ObservableWindowTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
index 3954be01a0..bfdeed1c6d 100644
--- a/src/test/java/io/reactivex/observable/ObservableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
@@ -11,17 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.*;
 
 public class ObservableWindowTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observable/ObservableZipTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
similarity index 94%
rename from src/test/java/io/reactivex/observable/ObservableZipTests.java
rename to src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
index 4e4927bb5f..b630807758 100644
--- a/src/test/java/io/reactivex/observable/ObservableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observable;
+package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertSame;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.*;
-import io.reactivex.observable.ObservableCovarianceTest.*;
-import io.reactivex.observable.ObservableEventStream.Event;
-import io.reactivex.observables.GroupedObservable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observable.ObservableCovarianceTest.*;
+import io.reactivex.rxjava3.observable.ObservableEventStream.Event;
+import io.reactivex.rxjava3.observables.GroupedObservable;
 
 public class ObservableZipTests extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/DisposableCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/observers/DisposableCompletableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
index 53146ce9f8..45d4b82172 100644
--- a/src/test/java/io/reactivex/observers/DisposableCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 
@@ -19,12 +19,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.observers.DisposableCompletableObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableCompletableObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/DisposableMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
similarity index 90%
rename from src/test/java/io/reactivex/observers/DisposableMaybeObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
index f5a55f737c..812e40ca3a 100644
--- a/src/test/java/io/reactivex/observers/DisposableMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 
@@ -19,12 +19,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.observers.DisposableMaybeObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableMaybeObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/DisposableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/observers/DisposableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
index 7aec9cb9fe..6a2b332293 100644
--- a/src/test/java/io/reactivex/observers/DisposableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/DisposableSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
similarity index 90%
rename from src/test/java/io/reactivex/observers/DisposableSingleObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
index 71793e2fc7..983a8dc847 100644
--- a/src/test/java/io/reactivex/observers/DisposableSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 
@@ -19,12 +19,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.observers.DisposableSingleObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableSingleObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/ResourceCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/observers/ResourceCompletableObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
index 27ea9a63e0..487f42352a 100644
--- a/src/test/java/io/reactivex/observers/ResourceCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
@@ -11,25 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-import io.reactivex.Completable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ResourceCompletableObserverTest extends RxJavaTest {
     static final class TestResourceCompletableObserver extends ResourceCompletableObserver {
diff --git a/src/test/java/io/reactivex/observers/ResourceMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
similarity index 90%
rename from src/test/java/io/reactivex/observers/ResourceMaybeObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
index 83111dd34d..92370a3203 100644
--- a/src/test/java/io/reactivex/observers/ResourceMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
@@ -11,26 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
+
+import static org.junit.Assert.*;
+
+import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import io.reactivex.Maybe;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ResourceMaybeObserverTest extends RxJavaTest {
     static final class TestResourceMaybeObserver extends ResourceMaybeObserver {
diff --git a/src/test/java/io/reactivex/observers/ResourceObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/observers/ResourceObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
index 47407eeb61..d81b7fbe88 100644
--- a/src/test/java/io/reactivex/observers/ResourceObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
@@ -11,25 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ResourceObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/ResourceSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
similarity index 89%
rename from src/test/java/io/reactivex/observers/ResourceSingleObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
index 67c766a417..1add001b63 100644
--- a/src/test/java/io/reactivex/observers/ResourceSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
@@ -11,26 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
+
+import static org.junit.Assert.*;
+
+import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ResourceSingleObserverTest extends RxJavaTest {
     static final class TestResourceSingleObserver extends ResourceSingleObserver {
diff --git a/src/test/java/io/reactivex/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
similarity index 98%
rename from src/test/java/io/reactivex/observers/SafeObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
index 818d1c0517..876bcffbe4 100644
--- a/src/test/java/io/reactivex/observers/SafeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.RxJavaTest;
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SafeObserverTest extends RxJavaTest {
 
@@ -408,7 +407,7 @@ public void onNextOnErrorCrash() {
             TestHelper.assertError(list, 0, CompositeException.class);
             List ce = TestHelper.compositeList(list.get(0));
             TestHelper.assertError(ce, 0, TestException.class, "onNext(1)");
-            TestHelper.assertError(ce, 1, TestException.class, "onError(io.reactivex.exceptions.TestException: onNext(1))");
+            TestHelper.assertError(ce, 1, TestException.class, "onError(io.reactivex.rxjava3.exceptions.TestException: onNext(1))");
         } finally {
             RxJavaPlugins.reset();
         }
diff --git a/src/test/java/io/reactivex/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
similarity index 99%
rename from src/test/java/io/reactivex/observers/SerializedObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index d282104c4e..ecb86d8417 100644
--- a/src/test/java/io/reactivex/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -22,12 +23,12 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SerializedObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
similarity index 97%
rename from src/test/java/io/reactivex/observers/TestObserverTest.java
rename to src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index c502aab72e..1468dc9cb5 100644
--- a/src/test/java/io/reactivex/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.observers;
+package io.reactivex.rxjava3.observers;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,24 +20,23 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class TestObserverTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
similarity index 92%
rename from src/test/java/io/reactivex/parallel/ParallelCollectTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
index c2cf2c909c..044c429d6c 100644
--- a/src/test/java/io/reactivex/parallel/ParallelCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelCollectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelDoOnNextTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
similarity index 97%
rename from src/test/java/io/reactivex/parallel/ParallelDoOnNextTryTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
index 50ad1c473f..47371b3073 100644
--- a/src/test/java/io/reactivex/parallel/ParallelDoOnNextTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
@@ -11,21 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelDoOnNextTryTest extends RxJavaTest implements Consumer {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelFilterTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
similarity index 90%
rename from src/test/java/io/reactivex/parallel/ParallelFilterTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
index c94087650b..1b77450986 100644
--- a/src/test/java/io/reactivex/parallel/ParallelFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -19,12 +19,12 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelFilterTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelFilterTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
similarity index 97%
rename from src/test/java/io/reactivex/parallel/ParallelFilterTryTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
index 1b1a7237ed..f2f7377942 100644
--- a/src/test/java/io/reactivex/parallel/ParallelFilterTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelFilterTryTest extends RxJavaTest implements Consumer {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
similarity index 98%
rename from src/test/java/io/reactivex/parallel/ParallelFlowableTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
index 726c1a552e..40afd9a511 100644
--- a/src/test/java/io/reactivex/parallel/ParallelFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -22,16 +22,16 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.util.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelFlowableTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
similarity index 90%
rename from src/test/java/io/reactivex/parallel/ParallelFromPublisherTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index 29fdde3e8c..0d889d21cb 100644
--- a/src/test/java/io/reactivex/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -21,16 +21,16 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscribers.BasicFuseableSubscriber;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.UnicastProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelFromPublisherTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelInvalid.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
similarity index 88%
rename from src/test/java/io/reactivex/parallel/ParallelInvalid.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
index c62112ee96..39e8ac21cf 100644
--- a/src/test/java/io/reactivex/parallel/ParallelInvalid.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.EmptySubscription;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 
 /**
  * Signals two onErrors to each subscriber for testing purposes.
diff --git a/src/test/java/io/reactivex/parallel/ParallelJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
similarity index 96%
rename from src/test/java/io/reactivex/parallel/ParallelJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
index 6f48c6ee67..fb50a775f8 100644
--- a/src/test/java/io/reactivex/parallel/ParallelJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
@@ -11,20 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelJoinTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
similarity index 92%
rename from src/test/java/io/reactivex/parallel/ParallelMapTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
index d671183474..c8e850daf1 100644
--- a/src/test/java/io/reactivex/parallel/ParallelMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelMapTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelMapTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
similarity index 97%
rename from src/test/java/io/reactivex/parallel/ParallelMapTryTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
index 508c8343f0..2df4dd1462 100644
--- a/src/test/java/io/reactivex/parallel/ParallelMapTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import java.util.List;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelMapTryTest extends RxJavaTest implements Consumer {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelPeekTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
similarity index 94%
rename from src/test/java/io/reactivex/parallel/ParallelPeekTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
index 3b904a1e49..85b311847a 100644
--- a/src/test/java/io/reactivex/parallel/ParallelPeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -21,12 +21,12 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelPeekTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelReduceFullTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
similarity index 92%
rename from src/test/java/io/reactivex/parallel/ParallelReduceFullTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
index 975977e9d3..56595583bb 100644
--- a/src/test/java/io/reactivex/parallel/ParallelReduceFullTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -20,13 +20,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelReduceFullTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
similarity index 93%
rename from src/test/java/io/reactivex/parallel/ParallelReduceTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
index b927ac9ba7..61ef50c1f6 100644
--- a/src/test/java/io/reactivex/parallel/ParallelReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelReduceTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
similarity index 93%
rename from src/test/java/io/reactivex/parallel/ParallelRunOnTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
index 5dab05be80..4b19afdc66 100644
--- a/src/test/java/io/reactivex/parallel/ParallelRunOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -21,17 +21,17 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelRunOnTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/parallel/ParallelSortedJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
similarity index 92%
rename from src/test/java/io/reactivex/parallel/ParallelSortedJoinTest.java
rename to src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
index 24e09f13b7..d2cc8aaec0 100644
--- a/src/test/java/io/reactivex/parallel/ParallelSortedJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.parallel;
+package io.reactivex.rxjava3.parallel;
 
 import static org.junit.Assert.*;
 
@@ -21,14 +21,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ParallelSortedJoinTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
similarity index 97%
rename from src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java
rename to src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
index 4b5f5eab87..c5cd3799ff 100644
--- a/src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.reactivex.plugins;
+package io.reactivex.rxjava3.plugins;
 
 import static org.junit.Assert.*;
 
@@ -25,30 +25,30 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.flowables.ConnectableFlowable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.operators.completable.CompletableError;
-import io.reactivex.internal.operators.flowable.FlowableRange;
-import io.reactivex.internal.operators.maybe.MaybeError;
-import io.reactivex.internal.operators.observable.ObservableRange;
-import io.reactivex.internal.operators.parallel.ParallelFromPublisher;
-import io.reactivex.internal.operators.single.SingleJust;
-import io.reactivex.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.internal.subscriptions.ScalarSubscription;
-import io.reactivex.observables.ConnectableObservable;
-import io.reactivex.parallel.ParallelFlowable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableError;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableRange;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeError;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableRange;
+import io.reactivex.rxjava3.internal.operators.parallel.ParallelFromPublisher;
+import io.reactivex.rxjava3.internal.operators.single.SingleJust;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class RxJavaPluginsTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
similarity index 97%
rename from src/test/java/io/reactivex/processors/AsyncProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 4baee260d9..421aee51a4 100644
--- a/src/test/java/io/reactivex/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -11,24 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class AsyncProcessorTest extends FlowableProcessorTest {
 
diff --git a/src/test/java/io/reactivex/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
similarity index 97%
rename from src/test/java/io/reactivex/processors/BehaviorProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
index be5650ac02..0d61998b30 100644
--- a/src/test/java/io/reactivex/processors/BehaviorProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -24,15 +25,15 @@
 import org.mockito.*;
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.BehaviorProcessor.BehaviorSubscription;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.BehaviorProcessor.BehaviorSubscription;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BehaviorProcessorTest extends FlowableProcessorTest {
 
diff --git a/src/test/java/io/reactivex/processors/FlowableProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
similarity index 94%
rename from src/test/java/io/reactivex/processors/FlowableProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
index 7611b5f350..f25b030757 100644
--- a/src/test/java/io/reactivex/processors/FlowableProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public abstract class FlowableProcessorTest  extends RxJavaTest {
 
     protected abstract FlowableProcessor create();
diff --git a/src/test/java/io/reactivex/processors/MulticastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
similarity index 98%
rename from src/test/java/io/reactivex/processors/MulticastProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
index 2f690e0482..0274a1f9a1 100644
--- a/src/test/java/io/reactivex/processors/MulticastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
 
@@ -22,13 +22,13 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MulticastProcessorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
similarity index 98%
rename from src/test/java/io/reactivex/processors/PublishProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
index 9e187a428b..3398e1bc58 100644
--- a/src/test/java/io/reactivex/processors/PublishProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -24,12 +25,12 @@
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class PublishProcessorTest extends FlowableProcessorTest {
 
diff --git a/src/test/java/io/reactivex/processors/ReplayProcessorBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
similarity index 98%
rename from src/test/java/io/reactivex/processors/ReplayProcessorBoundedConcurrencyTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
index ac3caaae81..8f733ae6ed 100644
--- a/src/test/java/io/reactivex/processors/ReplayProcessorBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,11 +22,11 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.DefaultSubscriber;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class ReplayProcessorBoundedConcurrencyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/processors/ReplayProcessorConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
similarity index 98%
rename from src/test/java/io/reactivex/processors/ReplayProcessorConcurrencyTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
index 77eca066bb..f9754a49ee 100644
--- a/src/test/java/io/reactivex/processors/ReplayProcessorConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,11 +22,11 @@
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.DefaultSubscriber;
-import io.reactivex.testsupport.TestSubscriberEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
 
 public class ReplayProcessorConcurrencyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
similarity index 99%
rename from src/test/java/io/reactivex/processors/ReplayProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index e2a1b49532..80fe3af7b7 100644
--- a/src/test/java/io/reactivex/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -26,15 +26,15 @@
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.processors.ReplayProcessor.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subscribers.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.ReplayProcessor.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subscribers.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ReplayProcessorTest extends FlowableProcessorTest {
 
diff --git a/src/test/java/io/reactivex/processors/SerializedProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
similarity index 98%
rename from src/test/java/io/reactivex/processors/SerializedProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
index 7e54924c31..0582689830 100644
--- a/src/test/java/io/reactivex/processors/SerializedProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
@@ -11,22 +11,21 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SerializedProcessorTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
similarity index 96%
rename from src/test/java/io/reactivex/processors/UnicastProcessorTest.java
rename to src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
index 87363419e3..96229747dc 100644
--- a/src/test/java/io/reactivex/processors/UnicastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.processors;
+package io.reactivex.rxjava3.processors;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class UnicastProcessorTest extends FlowableProcessorTest {
 
diff --git a/src/test/java/io/reactivex/schedulers/AbstractSchedulerConcurrencyTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
similarity index 98%
rename from src/test/java/io/reactivex/schedulers/AbstractSchedulerConcurrencyTests.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
index ce85455b2d..399a765305 100644
--- a/src/test/java/io/reactivex/schedulers/AbstractSchedulerConcurrencyTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
@@ -21,10 +21,10 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.functions.*;
-import io.reactivex.subscribers.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.subscribers.*;
 
 /**
  * Base tests for schedulers that involve threads (concurrency).
diff --git a/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
similarity index 97%
rename from src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
index 9e395f471e..578baa5cb3 100644
--- a/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,21 +20,21 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.*;
-import io.reactivex.internal.disposables.SequentialDisposable;
-import io.reactivex.internal.schedulers.TrampolineScheduler;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
 
 /**
  * Base tests for all schedulers including Immediate/Current.
diff --git a/src/test/java/io/reactivex/schedulers/CachedThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
similarity index 91%
rename from src/test/java/io/reactivex/schedulers/CachedThreadSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
index 2fc720ce8b..35be875a9a 100644
--- a/src/test/java/io/reactivex/schedulers/CachedThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
@@ -11,19 +11,19 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.schedulers.IoScheduler;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.schedulers.IoScheduler;
 
 public class CachedThreadSchedulerTest extends AbstractSchedulerConcurrencyTests {
 
diff --git a/src/test/java/io/reactivex/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
similarity index 95%
rename from src/test/java/io/reactivex/schedulers/ComputationSchedulerTests.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index 5167c390ff..6d2aec07c9 100644
--- a/src/test/java/io/reactivex/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.HashMap;
 import java.util.concurrent.*;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.functions.*;
-import io.reactivex.internal.schedulers.ComputationScheduler;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.schedulers.ComputationScheduler;
 
 public class ComputationSchedulerTests extends AbstractSchedulerConcurrencyTests {
 
diff --git a/src/test/java/io/reactivex/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
similarity index 97%
rename from src/test/java/io/reactivex/schedulers/ExecutorSchedulerInterruptibleTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
index 9bd7d602cf..369907bb3d 100644
--- a/src/test/java/io/reactivex/schedulers/ExecutorSchedulerInterruptibleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
@@ -20,16 +20,16 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ExecutorSchedulerInterruptibleTest extends AbstractSchedulerConcurrencyTests {
 
diff --git a/src/test/java/io/reactivex/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
similarity index 96%
rename from src/test/java/io/reactivex/schedulers/ExecutorSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
index 0224ab1571..7baebce0d5 100644
--- a/src/test/java/io/reactivex/schedulers/ExecutorSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
@@ -20,16 +20,16 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.EmptyDisposable;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.schedulers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.schedulers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ExecutorSchedulerTest extends AbstractSchedulerConcurrencyTests {
 
diff --git a/src/test/java/io/reactivex/schedulers/FailOnBlockingTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
similarity index 98%
rename from src/test/java/io/reactivex/schedulers/FailOnBlockingTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
index b624c55530..d8891ddc0c 100644
--- a/src/test/java/io/reactivex/schedulers/FailOnBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public class FailOnBlockingTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/schedulers/NewThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
similarity index 90%
rename from src/test/java/io/reactivex/schedulers/NewThreadSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
index 23491cb5b3..df114d23e8 100644
--- a/src/test/java/io/reactivex/schedulers/NewThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.Scheduler;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.*;
-import io.reactivex.internal.schedulers.NewThreadWorker;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.internal.schedulers.NewThreadWorker;
 
 public class NewThreadSchedulerTest extends AbstractSchedulerConcurrencyTests {
 
diff --git a/src/test/java/io/reactivex/schedulers/SchedulerLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
similarity index 95%
rename from src/test/java/io/reactivex/schedulers/SchedulerLifecycleTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
index 43e25d6fc0..6a8eb53344 100644
--- a/src/test/java/io/reactivex/schedulers/SchedulerLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
@@ -11,18 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.fail;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class SchedulerLifecycleTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/schedulers/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
similarity index 95%
rename from src/test/java/io/reactivex/schedulers/SchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
index dcc735af2a..fa97b1c0e7 100644
--- a/src/test/java/io/reactivex/schedulers/SchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
@@ -11,24 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.annotations.NonNull;
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.disposables.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SchedulerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/schedulers/SchedulerTestHelper.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
similarity index 96%
rename from src/test/java/io/reactivex/schedulers/SchedulerTestHelper.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
index 2291d44d9a..a31d2828b3 100644
--- a/src/test/java/io/reactivex/schedulers/SchedulerTestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
 import java.util.concurrent.*;
 
-import io.reactivex.*;
-import io.reactivex.subscribers.DefaultSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.subscribers.DefaultSubscriber;
 
 final class SchedulerTestHelper {
     private SchedulerTestHelper() {
diff --git a/src/test/java/io/reactivex/schedulers/SchedulerWorkerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
similarity index 95%
rename from src/test/java/io/reactivex/schedulers/SchedulerWorkerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
index d7810098f9..688e5fc429 100644
--- a/src/test/java/io/reactivex/schedulers/SchedulerWorkerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.annotations.NonNull;
 import org.junit.Test;
 
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class SchedulerWorkerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/schedulers/TestSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
similarity index 94%
rename from src/test/java/io/reactivex/schedulers/TestSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
index 1379818e99..8bcb177053 100644
--- a/src/test/java/io/reactivex/schedulers/TestSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
@@ -23,13 +24,13 @@
 import org.mockito.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.schedulers.TestScheduler.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.schedulers.TestScheduler.*;
 
 public class TestSchedulerTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/schedulers/TimedTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
similarity index 97%
rename from src/test/java/io/reactivex/schedulers/TimedTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
index bd159f7b85..0fb0ce9767 100644
--- a/src/test/java/io/reactivex/schedulers/TimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
@@ -11,15 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
-
-import java.util.concurrent.TimeUnit;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
+import java.util.concurrent.TimeUnit;
+
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public class TimedTest extends RxJavaTest {
 
     @Test
diff --git a/src/test/java/io/reactivex/schedulers/TrampolineSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
similarity index 91%
rename from src/test/java/io/reactivex/schedulers/TrampolineSchedulerTest.java
rename to src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
index 76910de05e..bfd7240db7 100644
--- a/src/test/java/io/reactivex/schedulers/TrampolineSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
@@ -11,27 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.schedulers;
-
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.TestHelper;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscriber;
+package io.reactivex.rxjava3.schedulers;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
 public class TrampolineSchedulerTest extends AbstractSchedulerTests {
 
     @Override
diff --git a/src/test/java/io/reactivex/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
similarity index 92%
rename from src/test/java/io/reactivex/single/SingleCacheTest.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
index c387b380ee..16221a253f 100644
--- a/src/test/java/io/reactivex/single/SingleCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
@@ -11,16 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Single;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 public class SingleCacheTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
similarity index 98%
rename from src/test/java/io/reactivex/single/SingleNullTests.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index d376678945..5b078e5edf 100644
--- a/src/test/java/io/reactivex/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -11,21 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
+
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.junit.Assert.*;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class SingleNullTests extends RxJavaTest {
 
@@ -420,7 +421,7 @@ public void zipNull() throws Exception {
             for (int argNull = 1; argNull <= argCount; argNull++) {
                 Class[] params = new Class[argCount + 1];
                 Arrays.fill(params, SingleSource.class);
-                Class fniClass = Class.forName("io.reactivex.functions.Function" + argCount);
+                Class fniClass = Class.forName("io.reactivex.rxjava3.functions.Function" + argCount);
                 params[argCount] = fniClass;
 
                 Object[] values = new Object[argCount + 1];
diff --git a/src/test/java/io/reactivex/single/SingleRetryTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
similarity index 95%
rename from src/test/java/io/reactivex/single/SingleRetryTest.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
index e1de4ab563..1d5a1bff33 100644
--- a/src/test/java/io/reactivex/single/SingleRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
@@ -11,17 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
+
+import static org.junit.Assert.assertEquals;
 
-import io.reactivex.RxJavaTest;
-import io.reactivex.Single;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 public class SingleRetryTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/single/SingleSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
similarity index 94%
rename from src/test/java/io/reactivex/single/SingleSubscribeTest.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
index 8a4e3c5335..68484d63c1 100644
--- a/src/test/java/io/reactivex/single/SingleSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
 
 import static org.junit.Assert.*;
 
@@ -20,14 +20,14 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleSubscribeTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/single/SingleTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
similarity index 97%
rename from src/test/java/io/reactivex/single/SingleTest.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleTest.java
index c1eabbe306..0e99b0b26d 100644
--- a/src/test/java/io/reactivex/single/SingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
 
 import static org.junit.Assert.*;
 
@@ -21,15 +21,15 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.operators.single.SingleInternalHelper;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subscribers.TestSubscriber;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.operators.single.SingleInternalHelper;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
similarity index 89%
rename from src/test/java/io/reactivex/single/SingleTimerTest.java
rename to src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
index 5d75c05a4c..c8624b710a 100644
--- a/src/test/java/io/reactivex/single/SingleTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
@@ -11,19 +11,18 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.single;
+package io.reactivex.rxjava3.single;
 
-import io.reactivex.RxJavaTest;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.Single;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.TestScheduler;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.TestScheduler;
 
 public class SingleTimerTest extends RxJavaTest {
     @Test
diff --git a/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
similarity index 97%
rename from src/test/java/io/reactivex/subjects/AsyncSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index 3bcc580a12..7a7e381bf9 100644
--- a/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -11,24 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.*;
 
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class AsyncSubjectTest extends SubjectTest {
 
diff --git a/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
similarity index 97%
rename from src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
index cea0b7d090..af73a522aa 100644
--- a/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
@@ -11,9 +11,10 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
@@ -23,15 +24,15 @@
 import org.junit.*;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Function;
-import io.reactivex.observers.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.BehaviorSubject.BehaviorDisposable;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.BehaviorSubject.BehaviorDisposable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class BehaviorSubjectTest extends SubjectTest {
 
diff --git a/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
similarity index 95%
rename from src/test/java/io/reactivex/subjects/CompletableSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
index a23ad5bcaf..764c36d7f6 100644
--- a/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableSubjectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
similarity index 96%
rename from src/test/java/io/reactivex/subjects/MaybeSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
index 3776d19478..8ff3f7b1b5 100644
--- a/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeSubjectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
similarity index 97%
rename from src/test/java/io/reactivex/subjects/PublishSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
index 01aa8d0804..43ebb533d5 100644
--- a/src/test/java/io/reactivex/subjects/PublishSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
@@ -11,24 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class PublishSubjectTest extends SubjectTest {
 
diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
similarity index 97%
rename from src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
index 259a1efa21..45520ebffa 100644
--- a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,14 +21,14 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.functions.Consumer;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestObserverEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
 public class ReplaySubjectBoundedConcurrencyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
similarity index 97%
rename from src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
index 716fcbf452..b0d2e55aad 100644
--- a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,14 +21,14 @@
 
 import org.junit.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.functions.Consumer;
-import io.reactivex.observers.DefaultObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestObserverEx;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.observers.DefaultObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
 public class ReplaySubjectConcurrencyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
similarity index 98%
rename from src/test/java/io/reactivex/subjects/ReplaySubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index f7f62a4807..1993112789 100644
--- a/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -25,14 +25,14 @@
 import org.junit.*;
 import org.mockito.*;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.observers.*;
-import io.reactivex.schedulers.*;
-import io.reactivex.subjects.ReplaySubject.*;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.ReplaySubject.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ReplaySubjectTest extends SubjectTest {
 
diff --git a/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
similarity index 98%
rename from src/test/java/io/reactivex/subjects/SerializedSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
index f107437a00..9355d77d29 100644
--- a/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
@@ -11,22 +11,22 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SerializedSubjectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/SingleSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
similarity index 95%
rename from src/test/java/io/reactivex/subjects/SingleSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
index 3b71ad6231..237cd03244 100644
--- a/src/test/java/io/reactivex/subjects/SingleSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 
@@ -20,11 +20,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleSubjectTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subjects/SubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
similarity index 94%
rename from src/test/java/io/reactivex/subjects/SubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
index 112bb993de..42c916f779 100644
--- a/src/test/java/io/reactivex/subjects/SubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.core.RxJavaTest;
+
 public abstract class SubjectTest extends RxJavaTest {
 
     protected abstract Subject create();
diff --git a/src/test/java/io/reactivex/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
similarity index 96%
rename from src/test/java/io/reactivex/subjects/UnicastSubjectTest.java
rename to src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index 85ba529a16..28c1d48de2 100644
--- a/src/test/java/io/reactivex/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subjects;
+package io.reactivex.rxjava3.subjects;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
@@ -21,13 +21,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class UnicastSubjectTest extends SubjectTest {
 
diff --git a/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
similarity index 94%
rename from src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
index 8b2deaec3b..ead17680fc 100644
--- a/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
@@ -11,16 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.*;
 
 public class DefaultSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
similarity index 90%
rename from src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
index fd5d25ae1f..5958110afb 100644
--- a/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.*;
 
@@ -19,11 +19,11 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class DisposableSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
similarity index 93%
rename from src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
index 1af2ed065f..190fe0e836 100644
--- a/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.*;
 
@@ -19,13 +19,13 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.EndConsumerHelper;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ResourceSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
similarity index 98%
rename from src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
index 84b2d67b3a..0dccdc1306 100644
--- a/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
@@ -11,23 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SafeSubscriberTest extends RxJavaTest {
 
@@ -557,7 +558,7 @@ public void onNextOnErrorCrash() {
             TestHelper.assertError(list, 0, CompositeException.class);
             List ce = TestHelper.compositeList(list.get(0));
             TestHelper.assertError(ce, 0, TestException.class, "onNext(1)");
-            TestHelper.assertError(ce, 1, TestException.class, "onError(io.reactivex.exceptions.TestException: onNext(1))");
+            TestHelper.assertError(ce, 1, TestException.class, "onError(io.reactivex.rxjava3.exceptions.TestException: onNext(1))");
         } finally {
             RxJavaPlugins.reset();
         }
diff --git a/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
similarity index 99%
rename from src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index 293af2412d..ac541e2bcd 100644
--- a/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -11,25 +11,25 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.reactivestreams.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SerializedSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
similarity index 98%
rename from src/test/java/io/reactivex/subscribers/TestSubscriberTest.java
rename to src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index f182081769..33d95bea88 100644
--- a/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.subscribers;
+package io.reactivex.rxjava3.subscribers;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -26,15 +26,15 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class TestSubscriberTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/tck/AllTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/AllTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
index d2308015e1..5d2ce5eed9 100644
--- a/src/test/java/io/reactivex/tck/AllTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Predicate;
 
 @Test
 public class AllTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/AmbArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/AmbArrayTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
index 944fdc628e..491eccb85b 100644
--- a/src/test/java/io/reactivex/tck/AmbArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class AmbArrayTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/AmbTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/AmbTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
index 0b71748e2d..2bdcf2c89f 100644
--- a/src/test/java/io/reactivex/tck/AmbTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class AmbTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/AnyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/AnyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
index b1d636fe99..5d93dd5462 100644
--- a/src/test/java/io/reactivex/tck/AnyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Predicate;
 
 @Test
 public class AnyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/AsyncProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/AsyncProcessorAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
index b1e3ba4405..87dd4afb33 100644
--- a/src/test/java/io/reactivex/tck/AsyncProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.AsyncProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.AsyncProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class AsyncProcessorAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/BaseTck.java b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
similarity index 96%
rename from src/test/java/io/reactivex/tck/BaseTck.java
rename to src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
index a06522a399..d14aac229f 100644
--- a/src/test/java/io/reactivex/tck/BaseTck.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.*;
 
@@ -19,8 +19,8 @@
 import org.reactivestreams.tck.*;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 /**
  * Base abstract class for Flowable verifications, contains support for creating
diff --git a/src/test/java/io/reactivex/tck/BehaviorProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/BehaviorProcessorAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
index 4843f25ea7..219a8ab1a2 100644
--- a/src/test/java/io/reactivex/tck/BehaviorProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.BehaviorProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.BehaviorProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class BehaviorProcessorAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/BufferBoundaryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/BufferBoundaryTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
index 1c53878850..18a6fe4a21 100644
--- a/src/test/java/io/reactivex/tck/BufferBoundaryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class BufferBoundaryTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/BufferExactSizeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/BufferExactSizeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
index cc9430e609..5af053e052 100644
--- a/src/test/java/io/reactivex/tck/BufferExactSizeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class BufferExactSizeTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/CacheTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/CacheTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
index 1b2a2c6bf6..460fb80e70 100644
--- a/src/test/java/io/reactivex/tck/CacheTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class CacheTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CollectTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/CollectTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
index 76a208e74e..fe09c2f061 100644
--- a/src/test/java/io/reactivex/tck/CollectTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiConsumer;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiConsumer;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class CollectTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/CombineLatestArrayDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/CombineLatestArrayDelayErrorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
index bc989a6241..eb662c8b90 100644
--- a/src/test/java/io/reactivex/tck/CombineLatestArrayDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class CombineLatestArrayDelayErrorTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CombineLatestArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/CombineLatestArrayTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
index 051076f442..7b57576d6e 100644
--- a/src/test/java/io/reactivex/tck/CombineLatestArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class CombineLatestArrayTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CombineLatestIterableDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/CombineLatestIterableDelayErrorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
index 3446af1dd9..b309de7837 100644
--- a/src/test/java/io/reactivex/tck/CombineLatestIterableDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class CombineLatestIterableDelayErrorTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CombineLatestIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/CombineLatestIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
index 7ae9a7add1..ed59b0aeb7 100644
--- a/src/test/java/io/reactivex/tck/CombineLatestIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class CombineLatestIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CompletableAndThenPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/CompletableAndThenPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
index 5a4c5f450c..9e9eae893d 100644
--- a/src/test/java/io/reactivex/tck/CompletableAndThenPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class CompletableAndThenPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatArrayEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatArrayEagerTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
index 598e15189a..7cf2fb3dc1 100644
--- a/src/test/java/io/reactivex/tck/ConcatArrayEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ConcatArrayEagerTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatIterableEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatIterableEagerTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
index 9d739e1675..6ab7f2a7ba 100644
--- a/src/test/java/io/reactivex/tck/ConcatIterableEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ConcatIterableEagerTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatMapIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ConcatMapIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
index d7b0f1ea74..43dcb2cf20 100644
--- a/src/test/java/io/reactivex/tck/ConcatMapIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Collections;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class ConcatMapIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatMapMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ConcatMapMaybeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
index 0e41d3f515..f01d8ec511 100644
--- a/src/test/java/io/reactivex/tck/ConcatMapMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class ConcatMapMaybeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatMapSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ConcatMapSingleTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
index dcb2564fba..9259f0dcd9 100644
--- a/src/test/java/io/reactivex/tck/ConcatMapSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class ConcatMapSingleTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ConcatMapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
index 6d77df3c75..7629d88742 100644
--- a/src/test/java/io/reactivex/tck/ConcatMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class ConcatMapTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatPublisherEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatPublisherEagerTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
index 8303f0103b..126fe4f01a 100644
--- a/src/test/java/io/reactivex/tck/ConcatPublisherEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ConcatPublisherEagerTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
index 62e6f7e8f9..4bbfe152f7 100644
--- a/src/test/java/io/reactivex/tck/ConcatPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ConcatPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
index 6b886b7cea..1ad7d79412 100644
--- a/src/test/java/io/reactivex/tck/ConcatTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ConcatTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatWithCompletableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatWithCompletableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
index 5a6b12cfeb..a1431efbf8 100644
--- a/src/test/java/io/reactivex/tck/ConcatWithCompletableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class ConcatWithCompletableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatWithMaybeEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatWithMaybeEmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
index 57d3440724..81611f79e4 100644
--- a/src/test/java/io/reactivex/tck/ConcatWithMaybeEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class ConcatWithMaybeEmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatWithMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatWithMaybeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
index e053a47811..08ecaee5ac 100644
--- a/src/test/java/io/reactivex/tck/ConcatWithMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class ConcatWithMaybeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ConcatWithSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ConcatWithSingleTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
index b46d344f15..234ebdf419 100644
--- a/src/test/java/io/reactivex/tck/ConcatWithSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class ConcatWithSingleTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/CreateTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
similarity index 94%
rename from src/test/java/io/reactivex/tck/CreateTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
index abad05b789..45a2d86ad7 100644
--- a/src/test/java/io/reactivex/tck/CreateTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class CreateTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DefaultIfEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/DefaultIfEmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
index 0febc42545..d8692cfc36 100644
--- a/src/test/java/io/reactivex/tck/DefaultIfEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class DefaultIfEmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DeferTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/DeferTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
index 1f3ba83fa4..cb75dbb290 100644
--- a/src/test/java/io/reactivex/tck/DeferTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Supplier;
 
 @Test
 public class DeferTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DelaySubscriptionTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/DelaySubscriptionTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
index 7cb581485c..28cc3243d7 100644
--- a/src/test/java/io/reactivex/tck/DelaySubscriptionTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class DelaySubscriptionTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DelayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/DelayTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
index a0e0231f57..d2d4c08de9 100644
--- a/src/test/java/io/reactivex/tck/DelayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class DelayTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DistinctTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/DistinctTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
index adb070bf98..35fe953720 100644
--- a/src/test/java/io/reactivex/tck/DistinctTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class DistinctTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DistinctUntilChangedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/DistinctUntilChangedTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
index 1227021e91..4c08351e46 100644
--- a/src/test/java/io/reactivex/tck/DistinctUntilChangedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class DistinctUntilChangedTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DoAfterNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/DoAfterNextTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
index e6e76780e2..1f988ee9f0 100644
--- a/src/test/java/io/reactivex/tck/DoAfterNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class DoAfterNextTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DoFinallyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/DoFinallyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
index b6b3ae89ad..e59dc8ba7d 100644
--- a/src/test/java/io/reactivex/tck/DoFinallyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class DoFinallyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/DoOnNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/DoOnNextTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
index 78bf7a6c11..418535f8e4 100644
--- a/src/test/java/io/reactivex/tck/DoOnNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class DoOnNextTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ElementAtTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ElementAtTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
index 2b2859b844..1563beb090 100644
--- a/src/test/java/io/reactivex/tck/ElementAtTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ElementAtTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/EmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/EmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
index 0fb5acad78..0b960f51b0 100644
--- a/src/test/java/io/reactivex/tck/EmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class EmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FilterTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
similarity index 89%
rename from src/test/java/io/reactivex/tck/FilterTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
index f1c4edcb4f..fc3cf46588 100644
--- a/src/test/java/io/reactivex/tck/FilterTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Predicate;
 
 @Test
 public class FilterTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FirstTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/FirstTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
index 1062370486..5dac1a42f1 100644
--- a/src/test/java/io/reactivex/tck/FirstTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class FirstTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FlatMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/FlatMapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
index f8677a6d2d..39b9afc454 100644
--- a/src/test/java/io/reactivex/tck/FlatMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class FlatMapTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FromArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/FromArrayTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
index 284362fb98..d8d88a1e68 100644
--- a/src/test/java/io/reactivex/tck/FromArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class FromArrayTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FromCallableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/FromCallableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
index 12e46a06c5..e235109619 100644
--- a/src/test/java/io/reactivex/tck/FromCallableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.Callable;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
 
 @Test
 public class FromCallableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FromFutureTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
similarity index 94%
rename from src/test/java/io/reactivex/tck/FromFutureTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
index 6fc3b09cb8..ee0dd0695a 100644
--- a/src/test/java/io/reactivex/tck/FromFutureTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.*;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class FromFutureTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FromIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/FromIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
index cafa1a8de6..0418584039 100644
--- a/src/test/java/io/reactivex/tck/FromIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class FromIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/FromSupplierTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
similarity index 89%
rename from src/test/java/io/reactivex/tck/FromSupplierTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
index 0878adc619..a19028deb8 100644
--- a/src/test/java/io/reactivex/tck/FromSupplierTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.Supplier;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
 
 @Test
 public class FromSupplierTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/GenerateTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/GenerateTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
index 55ab711f48..97cbb4a811 100644
--- a/src/test/java/io/reactivex/tck/GenerateTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class GenerateTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/GroupByTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/GroupByTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
index 06217db206..7d5f0503da 100644
--- a/src/test/java/io/reactivex/tck/GroupByTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class GroupByTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/HideTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/HideTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
index 59714e5cef..6fa26977c1 100644
--- a/src/test/java/io/reactivex/tck/HideTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class HideTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/IgnoreElementsTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/IgnoreElementsTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
index c6937cb638..6a1848e88a 100644
--- a/src/test/java/io/reactivex/tck/IgnoreElementsTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class IgnoreElementsTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/IntervalRangeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/IntervalRangeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
index 910bebfc93..181823e981 100644
--- a/src/test/java/io/reactivex/tck/IntervalRangeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class IntervalRangeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/IntervalTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/IntervalTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
index 6412a18a75..05a25f6774 100644
--- a/src/test/java/io/reactivex/tck/IntervalTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class IntervalTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/IsEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/IsEmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
index 4d0489648d..73cfb28550 100644
--- a/src/test/java/io/reactivex/tck/IsEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class IsEmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/JustTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/JustTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
index 76c9765984..02805e5125 100644
--- a/src/test/java/io/reactivex/tck/JustTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class JustTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/LastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/LastTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
index 0ae2e698a8..facdb09c32 100644
--- a/src/test/java/io/reactivex/tck/LastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class LastTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/LimitTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/LimitTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
index f12682396b..44bbc7363f 100644
--- a/src/test/java/io/reactivex/tck/LimitTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class LimitTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/MapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
index a9123bbd60..6c27b381d2 100644
--- a/src/test/java/io/reactivex/tck/MapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class MapTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MaybeFlatMapPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/MaybeFlatMapPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
index a05af6e197..7b582b97c5 100644
--- a/src/test/java/io/reactivex/tck/MaybeFlatMapPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class MaybeFlatMapPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
index 84b537b8c3..f597b70905 100644
--- a/src/test/java/io/reactivex/tck/MergeIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class MergeIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergePublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergePublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
index ea1b1a6c26..71241d03b1 100644
--- a/src/test/java/io/reactivex/tck/MergePublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class MergePublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
index 4e9a592931..aaefe13fee 100644
--- a/src/test/java/io/reactivex/tck/MergeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class MergeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeWithCompletableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeWithCompletableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
index 30e67e95ac..7345c157da 100644
--- a/src/test/java/io/reactivex/tck/MergeWithCompletableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class MergeWithCompletableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeWithMaybeEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeWithMaybeEmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
index 3d105c8842..cb7e919577 100644
--- a/src/test/java/io/reactivex/tck/MergeWithMaybeEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class MergeWithMaybeEmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeWithMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeWithMaybeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
index f5f7d4abef..d064babcdf 100644
--- a/src/test/java/io/reactivex/tck/MergeWithMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class MergeWithMaybeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MergeWithSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MergeWithSingleTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
index 28c3e8194b..cf0c894eae 100644
--- a/src/test/java/io/reactivex/tck/MergeWithSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 @Test
 public class MergeWithSingleTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MulticastProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/MulticastProcessorAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
index 01f4710c58..0c78050212 100644
--- a/src/test/java/io/reactivex/tck/MulticastProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.MulticastProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.MulticastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class MulticastProcessorAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/MulticastProcessorRefCountedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/MulticastProcessorRefCountedTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
index 0e61371f7e..53b150ef5e 100644
--- a/src/test/java/io/reactivex/tck/MulticastProcessorRefCountedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.*;
 
@@ -19,8 +19,8 @@
 import org.reactivestreams.tck.*;
 import org.testng.annotations.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.MulticastProcessor;
 
 @Test
 public class MulticastProcessorRefCountedTckTest extends IdentityProcessorVerification {
diff --git a/src/test/java/io/reactivex/tck/MulticastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/MulticastProcessorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
index 53dd476e6f..a1089b7370 100644
--- a/src/test/java/io/reactivex/tck/MulticastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.*;
 
@@ -19,8 +19,8 @@
 import org.reactivestreams.tck.*;
 import org.testng.annotations.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.MulticastProcessor;
 
 @Test
 public class MulticastProcessorTckTest extends IdentityProcessorVerification {
diff --git a/src/test/java/io/reactivex/tck/ObserveOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/ObserveOnTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
index 354962f81b..4b897c82be 100644
--- a/src/test/java/io/reactivex/tck/ObserveOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class ObserveOnTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/OnBackpressureBufferTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/OnBackpressureBufferTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
index 75f8ae607a..86839c926f 100644
--- a/src/test/java/io/reactivex/tck/OnBackpressureBufferTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class OnBackpressureBufferTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/OnErrorResumeWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/OnErrorResumeWithTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
index b50af2f686..d70e27bcf2 100644
--- a/src/test/java/io/reactivex/tck/OnErrorResumeWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class OnErrorResumeWithTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/OnErrorReturnItemTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/OnErrorReturnItemTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
index 02a6f3b767..708fe26829 100644
--- a/src/test/java/io/reactivex/tck/OnErrorReturnItemTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class OnErrorReturnItemTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/PublishProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/PublishProcessorAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
index 7b82099650..6154fd4b11 100644
--- a/src/test/java/io/reactivex/tck/PublishProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class PublishProcessorAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/PublishSelectorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
similarity index 84%
rename from src/test/java/io/reactivex/tck/PublishSelectorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
index 457d26f748..85cc653825 100644
--- a/src/test/java/io/reactivex/tck/PublishSelectorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class PublishSelectorTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/PublishTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/PublishTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
index b0bf3a46ad..8d436c2a06 100644
--- a/src/test/java/io/reactivex/tck/PublishTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class PublishTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/RangeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/RangeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
index 8e221603ad..3cba4e0566 100644
--- a/src/test/java/io/reactivex/tck/RangeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class RangeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/RebatchRequestsTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/RebatchRequestsTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
index b0bb4e4739..cca0025f76 100644
--- a/src/test/java/io/reactivex/tck/RebatchRequestsTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class RebatchRequestsTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReduceTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ReduceTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
index 6e638319d8..70253dcafb 100644
--- a/src/test/java/io/reactivex/tck/ReduceTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class ReduceTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReduceWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/ReduceWithTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
index f05c94428b..ba56f602c7 100644
--- a/src/test/java/io/reactivex/tck/ReduceWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class ReduceWithTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/RefCountProcessor.java b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
similarity index 96%
rename from src/test/java/io/reactivex/tck/RefCountProcessor.java
rename to src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
index de0538064b..908f3e010c 100644
--- a/src/test/java/io/reactivex/tck/RefCountProcessor.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.processors.FlowableProcessor;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.processors.FlowableProcessor;
 
 /**
  * A FlowableProcessor wrapper that disposes the Subscription set via
diff --git a/src/test/java/io/reactivex/tck/RepeatTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/RepeatTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
index 731f491904..1af7ffa8ff 100644
--- a/src/test/java/io/reactivex/tck/RepeatTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class RepeatTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
index 9e33b9b15d..9608b57358 100644
--- a/src/test/java/io/reactivex/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.ReplayProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.ReplayProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class ReplayProcessorSizeBoundAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
index 6edda768e6..41e5529796 100644
--- a/src/test/java/io/reactivex/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.ReplayProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.ReplayProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class ReplayProcessorTimeBoundAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReplayProcessorUnboundedAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
index 10796599aa..3bc7682284 100644
--- a/src/test/java/io/reactivex/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.ReplayProcessor;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.ReplayProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class ReplayProcessorUnboundedAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReplaySelectorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
similarity index 84%
rename from src/test/java/io/reactivex/tck/ReplaySelectorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
index 6dbef9c762..e944e57955 100644
--- a/src/test/java/io/reactivex/tck/ReplaySelectorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class ReplaySelectorTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ReplayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ReplayTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
index 8f7110cd82..4380e95746 100644
--- a/src/test/java/io/reactivex/tck/ReplayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ReplayTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/RetryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/RetryTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
index 022e4cedb1..d2608c2dce 100644
--- a/src/test/java/io/reactivex/tck/RetryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class RetryTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ScanTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ScanTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
index 9015e9c7a9..231e9a2590 100644
--- a/src/test/java/io/reactivex/tck/ScanTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class ScanTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SequenceEqualTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/SequenceEqualTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
index 1183cbb157..6c01635403 100644
--- a/src/test/java/io/reactivex/tck/SequenceEqualTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SequenceEqualTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ShareTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/ShareTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
index a5204e99f9..6e6b57e1b5 100644
--- a/src/test/java/io/reactivex/tck/ShareTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ShareTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SingleFlatMapFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/SingleFlatMapFlowableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
index 009bd5e50f..653ad462c1 100644
--- a/src/test/java/io/reactivex/tck/SingleFlatMapFlowableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.*;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class SingleFlatMapFlowableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SingleTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
index 5580b5f306..10de09fba7 100644
--- a/src/test/java/io/reactivex/tck/SingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SingleTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SkipLastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SkipLastTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
index 9ff5ab25e0..9583bbe646 100644
--- a/src/test/java/io/reactivex/tck/SkipLastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SkipLastTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SkipTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SkipTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
index 13fa65fa9d..fcd248374e 100644
--- a/src/test/java/io/reactivex/tck/SkipTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SkipTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SkipUntilTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SkipUntilTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
index 6c781b3a6d..762ca1256b 100644
--- a/src/test/java/io/reactivex/tck/SkipUntilTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SkipUntilTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SkipWhileTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/SkipWhileTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
index f6c5fa62f8..b560bb4694 100644
--- a/src/test/java/io/reactivex/tck/SkipWhileTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class SkipWhileTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SortedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SortedTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
index d66431b49b..c8132593e2 100644
--- a/src/test/java/io/reactivex/tck/SortedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SortedTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SubscribeOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/SubscribeOnTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
index 8e0840f444..c38720d6d0 100644
--- a/src/test/java/io/reactivex/tck/SubscribeOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class SubscribeOnTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SwitchIfEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SwitchIfEmptyTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
index 2b2208f830..9ba97747ff 100644
--- a/src/test/java/io/reactivex/tck/SwitchIfEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SwitchIfEmptyTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SwitchMapDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/SwitchMapDelayErrorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
index f4d963836a..cb27667aec 100644
--- a/src/test/java/io/reactivex/tck/SwitchMapDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class SwitchMapDelayErrorTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SwitchMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/SwitchMapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
index e2593903db..1d8ec8f800 100644
--- a/src/test/java/io/reactivex/tck/SwitchMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class SwitchMapTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/SwitchOnNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/SwitchOnNextTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
index 2828c92a7d..d275ca6766 100644
--- a/src/test/java/io/reactivex/tck/SwitchOnNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class SwitchOnNextTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TakeLastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/TakeLastTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
index 6e8260ff14..594db93c9f 100644
--- a/src/test/java/io/reactivex/tck/TakeLastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class TakeLastTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TakeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/TakeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
index bcc8682a7e..1b2529c914 100644
--- a/src/test/java/io/reactivex/tck/TakeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class TakeTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TakeUntilTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/TakeUntilTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
index 7c17861425..256c01cc00 100644
--- a/src/test/java/io/reactivex/tck/TakeUntilTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class TakeUntilTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TakeWhileTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
similarity index 87%
rename from src/test/java/io/reactivex/tck/TakeWhileTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
index 511b403a6d..aa2d32939b 100644
--- a/src/test/java/io/reactivex/tck/TakeWhileTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class TakeWhileTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TimeIntervalTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/TimeIntervalTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
index 524d08ebac..d0c7cd52f4 100644
--- a/src/test/java/io/reactivex/tck/TimeIntervalTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Timed;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Timed;
 
 @Test
 public class TimeIntervalTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/TimeoutTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/TimeoutTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
index e7229347ed..52ad8d01aa 100644
--- a/src/test/java/io/reactivex/tck/TimeoutTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class TimeoutTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TimerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/TimerTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
index 2b64b957a6..5e280bd520 100644
--- a/src/test/java/io/reactivex/tck/TimerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
-import java.util.concurrent.*;
+import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class TimerTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/TimestampTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/TimestampTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
index 1c2886712a..acdef0b9ee 100644
--- a/src/test/java/io/reactivex/tck/TimestampTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Timed;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Timed;
 
 @Test
 public class TimestampTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/ToListTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ToListTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
index 95988ef08d..7d7c11bf8c 100644
--- a/src/test/java/io/reactivex/tck/ToListTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ToListTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/ToMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/ToMapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
index 15fbb94a6f..8fe4361189 100644
--- a/src/test/java/io/reactivex/tck/ToMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Map;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class ToMapTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/ToMultimapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
similarity index 89%
rename from src/test/java/io/reactivex/tck/ToMultimapTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
index 4216b9e34c..925f147a7e 100644
--- a/src/test/java/io/reactivex/tck/ToMultimapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.*;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class ToMultimapTckTest extends BaseTck>> {
diff --git a/src/test/java/io/reactivex/tck/ToSortedListTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
similarity index 93%
rename from src/test/java/io/reactivex/tck/ToSortedListTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
index 84688d6b15..fed8ec3669 100644
--- a/src/test/java/io/reactivex/tck/ToSortedListTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Test
 public class ToSortedListTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/UnicastProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/UnicastProcessorAsPublisherTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
index d64164936b..142ffbd4a7 100644
--- a/src/test/java/io/reactivex/tck/UnicastProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class UnicastProcessorAsPublisherTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/UnicastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
similarity index 92%
rename from src/test/java/io/reactivex/tck/UnicastProcessorTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
index e6490905ea..f97b6ee83a 100644
--- a/src/test/java/io/reactivex/tck/UnicastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.concurrent.*;
 
@@ -19,8 +19,8 @@
 import org.reactivestreams.tck.*;
 import org.testng.annotations.Test;
 
-import io.reactivex.exceptions.TestException;
-import io.reactivex.processors.UnicastProcessor;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
 
 @Test
 public class UnicastProcessorTckTest extends IdentityProcessorVerification {
diff --git a/src/test/java/io/reactivex/tck/UnsubscribeOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/UnsubscribeOnTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
index 9884b1573d..c3a386f387 100644
--- a/src/test/java/io/reactivex/tck/UnsubscribeOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Test
 public class UnsubscribeOnTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/UsingTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
similarity index 88%
rename from src/test/java/io/reactivex/tck/UsingTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
index 094ffd06bb..9c0e41f3d9 100644
--- a/src/test/java/io/reactivex/tck/UsingTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class UsingTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/WindowBoundaryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
similarity index 86%
rename from src/test/java/io/reactivex/tck/WindowBoundaryTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
index 396444a82e..bee09d0eb5 100644
--- a/src/test/java/io/reactivex/tck/WindowBoundaryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class WindowBoundaryTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/WindowExactSizeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
similarity index 85%
rename from src/test/java/io/reactivex/tck/WindowExactSizeTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
index 46b9d55188..5ee3500379 100644
--- a/src/test/java/io/reactivex/tck/WindowExactSizeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.List;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @Test
 public class WindowExactSizeTckTest extends BaseTck> {
diff --git a/src/test/java/io/reactivex/tck/WithLatestFromTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/WithLatestFromTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
index 5f119fa4db..3d91048c37 100644
--- a/src/test/java/io/reactivex/tck/WithLatestFromTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class WithLatestFromTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ZipIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
similarity index 91%
rename from src/test/java/io/reactivex/tck/ZipIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
index df287543f0..ec4583ff07 100644
--- a/src/test/java/io/reactivex/tck/ZipIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
 
 @Test
 public class ZipIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ZipTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ZipTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
index 7aa98c1a47..4c94e97ed7 100644
--- a/src/test/java/io/reactivex/tck/ZipTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class ZipTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ZipWithIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ZipWithIterableTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
index b0bb8bfef9..2d9eae43ea 100644
--- a/src/test/java/io/reactivex/tck/ZipWithIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class ZipWithIterableTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/tck/ZipWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
similarity index 90%
rename from src/test/java/io/reactivex/tck/ZipWithTckTest.java
rename to src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
index 7a7ac71bcd..f71dd6b98d 100644
--- a/src/test/java/io/reactivex/tck/ZipWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.tck;
+package io.reactivex.rxjava3.tck;
 
 import org.reactivestreams.Publisher;
 import org.testng.annotations.Test;
 
-import io.reactivex.Flowable;
-import io.reactivex.functions.BiFunction;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.BiFunction;
 
 @Test
 public class ZipWithTckTest extends BaseTck {
diff --git a/src/test/java/io/reactivex/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
similarity index 96%
rename from src/test/java/io/reactivex/testsupport/BaseTestConsumerEx.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index e36d13bfb8..d997a065ba 100644
--- a/src/test/java/io/reactivex/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import java.util.List;
 
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observers.BaseTestConsumer;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observers.BaseTestConsumer;
 
 /**
  * Base class with shared infrastructure to support TestSubscriber and TestObserver.
diff --git a/src/test/java/io/reactivex/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
similarity index 98%
rename from src/test/java/io/reactivex/testsupport/TestHelper.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 838db6bcf2..7b7ebfac2a 100644
--- a/src/test/java/io/reactivex/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -29,26 +29,26 @@
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.ObjectHelper;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.operators.completable.CompletableToFlowable;
-import io.reactivex.internal.operators.maybe.MaybeToFlowable;
-import io.reactivex.internal.operators.single.SingleToFlowable;
-import io.reactivex.internal.subscriptions.BooleanSubscription;
-import io.reactivex.internal.util.ExceptionHelper;
-import io.reactivex.observers.BaseTestConsumer;
-import io.reactivex.parallel.ParallelFlowable;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.processors.PublishProcessor;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.Subject;
-import io.reactivex.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
+import io.reactivex.rxjava3.internal.operators.single.SingleToFlowable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.observers.BaseTestConsumer;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.Subject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 
 /**
  * Common methods for helping with tests.
@@ -3244,7 +3244,7 @@ public static File findSource(String baseClassName) throws Exception {
         // find end of any potential postfix to /RxJava
         int j = path.indexOf("/", i + 6);
 
-        String p = path.substring(0, j + 1) + "src/main/java/io/reactivex/" + baseClassName + ".java";
+        String p = path.substring(0, j + 1) + "src/main/java/io/reactivex/rxjava3/core/" + baseClassName + ".java";
 
         File f = new File(p);
 
diff --git a/src/test/java/io/reactivex/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
similarity index 97%
rename from src/test/java/io/reactivex/testsupport/TestObserverEx.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index 1d6a251c00..9747d034bb 100644
--- a/src/test/java/io/reactivex/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -10,14 +10,14 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.internal.disposables.DisposableHelper;
-import io.reactivex.internal.fuseable.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
 
 /**
  * An  extended test Observer that records events and allows making assertions about them.
diff --git a/src/test/java/io/reactivex/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
similarity index 98%
rename from src/test/java/io/reactivex/testsupport/TestObserverExTest.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index cf7425b792..6f8d3e25cc 100644
--- a/src/test/java/io/reactivex/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -20,22 +20,22 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.RxJavaTest;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 import org.mockito.InOrder;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.*;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
-import io.reactivex.observers.TestObserver;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
 
 public class TestObserverExTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
similarity index 98%
rename from src/test/java/io/reactivex/testsupport/TestSubscriberEx.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index 5435ba6d12..bdc1a6a1da 100644
--- a/src/test/java/io/reactivex/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -10,15 +10,15 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
-import io.reactivex.FlowableSubscriber;
-import io.reactivex.internal.fuseable.*;
-import io.reactivex.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 
 /**
  * An extended test subscriber that records events and allows making assertions about them.
diff --git a/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
similarity index 99%
rename from src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
index eb3a4b0df1..24a9e84c9b 100644
--- a/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -26,15 +26,15 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Scheduler.Worker;
-import io.reactivex.exceptions.*;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.internal.fuseable.QueueFuseable;
-import io.reactivex.internal.subscriptions.*;
-import io.reactivex.processors.*;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class TestSubscriberExTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/testsupport/TimesteppingScheduler.java b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
similarity index 92%
rename from src/test/java/io/reactivex/testsupport/TimesteppingScheduler.java
rename to src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
index 31e467fd83..bf1da1237c 100644
--- a/src/test/java/io/reactivex/testsupport/TimesteppingScheduler.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
@@ -11,12 +11,12 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.testsupport;
+package io.reactivex.rxjava3.testsupport;
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.*;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.*;
 
 /**
  * Basic scheduler that produces an ever increasing {@link #now(TimeUnit)} value.
diff --git a/src/test/java/io/reactivex/validators/BaseTypeAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
similarity index 98%
rename from src/test/java/io/reactivex/validators/BaseTypeAnnotations.java
rename to src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
index 5445115b44..36457ffd86 100644
--- a/src/test/java/io/reactivex/validators/BaseTypeAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import static org.junit.Assert.fail;
 
@@ -20,8 +20,8 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.*;
-import io.reactivex.annotations.*;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
 
 /**
  * Verifies several properties.
diff --git a/src/test/java/io/reactivex/validators/BaseTypeParser.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
similarity index 99%
rename from src/test/java/io/reactivex/validators/BaseTypeParser.java
rename to src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
index 42903ee386..1dd9f1c1ce 100644
--- a/src/test/java/io/reactivex/validators/BaseTypeParser.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.File;
 import java.util.*;
diff --git a/src/test/java/io/reactivex/validators/CheckLocalVariablesInTests.java b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
similarity index 98%
rename from src/test/java/io/reactivex/validators/CheckLocalVariablesInTests.java
rename to src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
index 94bb70ec47..221896fea2 100644
--- a/src/test/java/io/reactivex/validators/CheckLocalVariablesInTests.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Checks for commonly copy-pasted but not-renamed local variables in unit tests.
@@ -54,7 +54,7 @@ static void findPattern(String pattern, boolean checkMain) throws Exception {
         StringBuilder fail = new StringBuilder();
         fail.append("The following code pattern was found: ").append(pattern).append("\n");
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
 
         if (checkMain) {
             dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/')));
diff --git a/src/test/java/io/reactivex/validators/FixLicenseHeaders.java b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
similarity index 96%
rename from src/test/java/io/reactivex/validators/FixLicenseHeaders.java
rename to src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
index 55a2b9339f..f069ec43cf 100644
--- a/src/test/java/io/reactivex/validators/FixLicenseHeaders.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Adds license header to java files.
@@ -54,7 +54,7 @@ public void checkAndUpdateLicenses() throws Exception {
 
         Queue dirs = new ArrayDeque();
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
         dirs.offer(parent);
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/perf/java")));
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/test/java")));
diff --git a/src/test/java/io/reactivex/validators/InternalWrongNaming.java b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
similarity index 96%
rename from src/test/java/io/reactivex/validators/InternalWrongNaming.java
rename to src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
index fb8ea841da..984d6bbbd5 100644
--- a/src/test/java/io/reactivex/validators/InternalWrongNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Adds license header to java files.
@@ -31,7 +31,7 @@ static void checkInternalOperatorNaming(String baseClassName, String consumerCla
             return;
         }
 
-        String rxdir = f.getParentFile().getAbsolutePath().replace('\\', '/');
+        String rxdir = f.getParentFile().getParentFile().getAbsolutePath().replace('\\', '/');
 
         if (!rxdir.endsWith("/")) {
             rxdir += "/";
diff --git a/src/test/java/io/reactivex/validators/JavadocFindUnescapedAngleBrackets.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
similarity index 96%
rename from src/test/java/io/reactivex/validators/JavadocFindUnescapedAngleBrackets.java
rename to src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
index 3fa21d636a..7ebdd1e8a1 100644
--- a/src/test/java/io/reactivex/validators/JavadocFindUnescapedAngleBrackets.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
@@ -11,13 +11,13 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class JavadocFindUnescapedAngleBrackets {
 
@@ -29,7 +29,7 @@ public void find() throws Exception {
             return;
         }
 
-        base = base.getParentFile();
+        base = base.getParentFile().getParentFile();
 
         Queue files = new ArrayDeque();
 
diff --git a/src/test/java/io/reactivex/validators/JavadocForAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
similarity index 98%
rename from src/test/java/io/reactivex/validators/JavadocForAnnotations.java
rename to src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
index 5e2f4e071a..2f16d05c14 100644
--- a/src/test/java/io/reactivex/validators/JavadocForAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
@@ -11,16 +11,16 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import static org.junit.Assert.fail;
 
 import java.io.*;
 
-import org.junit.*;
+import org.junit.Test;
 
-import io.reactivex.*;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Checks the source code of the base reactive types and locates missing
diff --git a/src/test/java/io/reactivex/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
similarity index 99%
rename from src/test/java/io/reactivex/validators/JavadocWording.java
rename to src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index 340a201f73..e8219df148 100644
--- a/src/test/java/io/reactivex/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -11,16 +11,17 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
+
+import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
-import io.reactivex.validators.BaseTypeParser.RxMethod;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.validators.BaseTypeParser.RxMethod;
 
 /**
  * Check if the method wording is consistent with the target base type.
diff --git a/src/test/java/io/reactivex/validators/MaybeNo2Dot0Since.java b/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
similarity index 94%
rename from src/test/java/io/reactivex/validators/MaybeNo2Dot0Since.java
rename to src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
index c38b4b0267..f8b9e63164 100644
--- a/src/test/java/io/reactivex/validators/MaybeNo2Dot0Since.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import static org.junit.Assert.fail;
 
@@ -19,8 +19,8 @@
 
 import org.junit.Test;
 
-import io.reactivex.Maybe;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Checks the source code of Maybe and finds unnecessary since 2.0 annotations in the
diff --git a/src/test/java/io/reactivex/validators/NewLinesBeforeAnnotation.java b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
similarity index 97%
rename from src/test/java/io/reactivex/validators/NewLinesBeforeAnnotation.java
rename to src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
index 69594f7621..1e4177c4cd 100644
--- a/src/test/java/io/reactivex/validators/NewLinesBeforeAnnotation.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * These tests verify the code style that a typical closing curly brace
@@ -82,7 +82,7 @@ static void findPattern(int newLines) throws Exception {
         }
         fail.append("[    ]+@\n");
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
 
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/')));
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/test/java")));
diff --git a/src/test/java/io/reactivex/validators/NoAnonymousInnerClassesTest.java b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
similarity index 99%
rename from src/test/java/io/reactivex/validators/NoAnonymousInnerClassesTest.java
rename to src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
index b7dcc0f2ba..d744c2a48c 100644
--- a/src/test/java/io/reactivex/validators/NoAnonymousInnerClassesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.net.URL;
diff --git a/src/test/java/io/reactivex/validators/OperatorsAreFinal.java b/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
similarity index 88%
rename from src/test/java/io/reactivex/validators/OperatorsAreFinal.java
rename to src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
index d6d9753eac..6343a6e02b 100644
--- a/src/test/java/io/reactivex/validators/OperatorsAreFinal.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.File;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class OperatorsAreFinal {
 
@@ -28,7 +28,7 @@ File directoryOf(String baseClassName) throws Exception {
             return null;
         }
 
-        String parent = f.getParentFile().getAbsolutePath().replace('\\', '/');
+        String parent = f.getParentFile().getParentFile().getAbsolutePath().replace('\\', '/');
         if (!parent.endsWith("/")) {
             parent += "/";
         }
@@ -49,7 +49,7 @@ void check(String baseClassName) throws Exception {
         if (files != null) {
             for (File g : files) {
                 if (g.getName().startsWith(baseClassName) && g.getName().endsWith(".java")) {
-                    String className = "io.reactivex.internal.operators." + baseClassName.toLowerCase() + "." + g.getName().replace(".java", "");
+                    String className = "io.reactivex.rxjava3.internal.operators." + baseClassName.toLowerCase() + "." + g.getName().replace(".java", "");
 
                     Class clazz = Class.forName(className);
 
diff --git a/src/test/java/io/reactivex/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
similarity index 99%
rename from src/test/java/io/reactivex/validators/ParamValidationCheckerTest.java
rename to src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 47b5a2f88e..f515064913 100644
--- a/src/test/java/io/reactivex/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.lang.reflect.*;
 import java.util.*;
@@ -20,17 +20,17 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
-import io.reactivex.*;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.TestException;
-import io.reactivex.functions.*;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.parallel.*;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.parallel.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Check that static and instance methods validate their parameters against
diff --git a/src/test/java/io/reactivex/validators/PublicFinalMethods.java b/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
similarity index 95%
rename from src/test/java/io/reactivex/validators/PublicFinalMethods.java
rename to src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
index d3d1c47188..f7f59d630d 100644
--- a/src/test/java/io/reactivex/validators/PublicFinalMethods.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import static org.junit.Assert.fail;
 
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 
 /**
  * Verifies that instance methods of the base reactive classes are all declared final.
diff --git a/src/test/java/io/reactivex/validators/TestPrefixInMethodName.java b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
similarity index 94%
rename from src/test/java/io/reactivex/validators/TestPrefixInMethodName.java
rename to src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
index 1715b7dae6..aedcc603f7 100644
--- a/src/test/java/io/reactivex/validators/TestPrefixInMethodName.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
@@ -11,19 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
-import org.junit.Test;
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
 
-import io.reactivex.testsupport.TestHelper;
+import org.junit.Test;
 
-import java.io.*;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Check verifying there are no methods with the prefix "test" in the name.
@@ -47,7 +43,7 @@ public void checkAndUpdateTestMethodNames() throws Exception {
         fail.append("The following code pattern was found: ").append(pattern).append("\n");
         fail.append("Refresh and re-run tests!\n\n");
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
 
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/')));
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/test/java")));
diff --git a/src/test/java/io/reactivex/validators/TextualAorAn.java b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
similarity index 98%
rename from src/test/java/io/reactivex/validators/TextualAorAn.java
rename to src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
index 4223ba0455..4f693bd02c 100644
--- a/src/test/java/io/reactivex/validators/TextualAorAn.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Adds license header to java files.
@@ -34,7 +34,7 @@ public void checkFiles() throws Exception {
 
         Queue dirs = new ArrayDeque();
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
         dirs.offer(parent);
 //        dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/perf/java")));
 //        dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/test/java")));
diff --git a/src/test/java/io/reactivex/validators/TooManyEmptyNewLines.java b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
similarity index 96%
rename from src/test/java/io/reactivex/validators/TooManyEmptyNewLines.java
rename to src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
index 7fa6ecf7fb..abb60dcd46 100644
--- a/src/test/java/io/reactivex/validators/TooManyEmptyNewLines.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
@@ -11,14 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.validators;
+package io.reactivex.rxjava3.validators;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.Test;
 
-import io.reactivex.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
  * Test verifying there are no 2..5 empty newlines in the code.
@@ -62,7 +62,7 @@ static void findPattern(int newLines) throws Exception {
         }
         fail.append("\n");
 
-        File parent = f.getParentFile();
+        File parent = f.getParentFile().getParentFile();
 
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/')));
         dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/').replace("src/main/java", "src/test/java")));

From 42c53558b32aee1a0683207da72e309a5f69e0b1 Mon Sep 17 00:00:00 2001
From: akarnokd 
Date: Fri, 16 Aug 2019 13:05:06 +0200
Subject: [PATCH 2/4] fix javadoc cleanup gradle

---
 gradle/javadoc_cleanup.gradle | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 518d7a1d51..279c912ecc 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -1,19 +1,19 @@
 // remove the excessive whitespaces between method arguments in the javadocs
 task javadocCleanup(dependsOn: "javadoc") doLast {
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Flowable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Observable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Single.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Maybe.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Completable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Flowable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Observable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Single.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Maybe.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Completable.html'));
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/flowables/ConnectableFlowable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/observables/ConnectableObservable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html'));
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/subjects/ReplaySubject.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/processors/ReplayProcessor.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/plugins/RxJavaPlugins.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/ReplaySubject.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/ReplayProcessor.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'));
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/parallel/ParallelFlowable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'));
 }
 
 def fixJavadocFile(file) {

From ba047d7db4876fccaa8e199107a0d81a326ee231 Mon Sep 17 00:00:00 2001
From: akarnokd 
Date: Fri, 16 Aug 2019 13:11:00 +0200
Subject: [PATCH 3/4] javadoc gradle again

---
 gradle/javadoc_cleanup.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 279c912ecc..12216464a7 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -1,10 +1,10 @@
 // remove the excessive whitespaces between method arguments in the javadocs
 task javadocCleanup(dependsOn: "javadoc") doLast {
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Flowable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Observable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Single.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Maybe.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/Completable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Flowable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Observable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Single.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Maybe.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Completable.html'));
 
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html'));
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html'));

From 5adb308c66635cccabfe1067e1c870fe24dd0ac8 Mon Sep 17 00:00:00 2001
From: akarnokd 
Date: Fri, 16 Aug 2019 13:24:05 +0200
Subject: [PATCH 4/4] Fix package location in text

---
 .../internal/operators/flowable/NotificationLiteTest.java       | 2 +-
 src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
index dfcd611b86..1df91fbe4d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
@@ -51,7 +51,7 @@ public void soloEnum() {
     public void errorNotification() {
         Object o = NotificationLite.error(new TestException());
 
-        assertEquals("NotificationLite.Error[io.reactivex.exceptions.TestException]", o.toString());
+        assertEquals("NotificationLite.Error[io.reactivex.rxjava3.exceptions.TestException]", o.toString());
 
         assertTrue(NotificationLite.isError(o));
         assertFalse(NotificationLite.isComplete(o));
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 5b078e5edf..8210632567 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -464,7 +464,7 @@ public Object invoke(Object o, Method m1, Object[] a) throws Throwable {
 
             Class[] params = new Class[argCount + 1];
             Arrays.fill(params, SingleSource.class);
-            Class fniClass = Class.forName("io.reactivex.functions.Function" + argCount);
+            Class fniClass = Class.forName("io.reactivex.rxjava3.functions.Function" + argCount);
             params[argCount] = fniClass;
 
             Object[] values = new Object[argCount + 1];